cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-22 08:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,725 Commits 74 Branches 23 Tags
0069dc653c1720c07bc16ae29cf8314a9c5c0e61
Commit Graph

21603 Commits

Author SHA1 Message Date
Ccomp5950
0069dc653c Merge pull request #11835 from GinjaNinja32/11828 
fix #11828
 2015-12-30 15:18:45 -05:00
Ccomp5950
8c8e1ae348 Merge pull request #11836 from PsiOmegaDelta/151230-GlowyStuff 
Door related glow.
 2015-12-30 15:18:13 -05:00
PsiOmegaDelta
6ff99e2bd7 Door bolt lights and alarming emergency shutters now glow. 2015-12-30 20:32:14 +01:00
GinjaNinja32
a56597a3c5 Merge pull request #11823 from PsiOmegaDelta/151230-MapTweaks 
Fixes.
 2015-12-30 18:48:44 +00:00
GinjaNinja32
14c6331e08 Merge pull request #11830 from PsiOmegaDelta/151230-FloorDecals 
Floor decals now layer below the turf layer.
 2015-12-30 18:47:58 +00:00
GinjaNinja32
d309e9e98f fix #11828 2015-12-30 18:46:25 +00:00
PsiOmegaDelta
7e58375e4f Removes a debug line in the character flavor setup. 
Fixes #11831.
 2015-12-30 18:25:03 +01:00
PsiOmegaDelta
0922cf5e2f Floor decals now layer below the turf layer. 
This doesn't actually make them invisible, as turfs will always display below everything else, but will ensure decals display below anything else on turf level.
Fixes #10754. Fixes #11826.
 2015-12-30 18:07:46 +01:00
PsiOmegaDelta
a85f408c29 Re-fixes skin tone not displaying the proper value when being edited in the character setup. 2015-12-30 12:16:16 +01:00
PsiOmegaDelta
0425b60d66 The GetIdCard() proc now priorities held id cards. 
Fixes #11824 to the maximum degree I'm prepared to go.
 2015-12-30 12:07:13 +01:00
PsiOmegaDelta
ac39757a03 Blast doors now explicitly set opacity to 1 when dense (i.e. when closing). 
Fixes #11789.
 2015-12-30 11:53:45 +01:00
PsiOmegaDelta
96cbc225ff Bags with the auto-pickup ability can no longer grab anchored objects. 
Also fixes the canUnEquip() proc. It now only checks state, it doesn't change it. Fixes #11819 and probably a couple other odd item interactions.
 2015-12-30 11:28:54 +01:00
PsiOmegaDelta
8edf5cebc5 Merge pull request #11822 from Ccomp5950/fix_mining 
Makes the mining asteroid airless again.
 2015-12-30 10:31:41 +01:00
ccomp5950
ca55595f1b Makes the mining asteroid airless again. 
This turf surrounds the edges of the map.

air was "leaking" through it from off the map filling the zones that touch it with air.

fixes: #11365
 2015-12-30 00:13:12 -05:00
Chinsky
e512061d3c Merge pull request #10002 from atlantiscze/NTOSv2 
[READY FOR MERGE] Modular Computers
 2015-12-30 06:57:27 +03:00
Chinsky
d5c31ba34f Merge pull request #11818 from Kearel/fixHydro 
Fixes #11661
 2015-12-30 06:17:00 +03:00
Atlantis
a364dbf35d Implements emagging 
- Makes use of emag_act() to enable emagging of modular computers.
- Programs are now properly informed every tick to see whether the computer is emagged or not.
- As of now, the only program that acts differently is software downloader that allows downloads of malicious programs.
 2015-12-30 04:08:06 +01:00
Atlantis
9e1168ae9c Assorted bugfixes and tweaks + changelog 
- Adds codersprites for tablet programs that are currently required.
- Adds computer icons to some programs that missed them.
- Temporarily removes separate keyboard icon states for consoles. They may be reimplemented in the future in a bit better way.
- Rebalanced sizes of programs a bit
- File manager is no longer downloadable, as it is part of each hard drive's ROM.
- Fixed runtime error when vending a laptop
- Adjusted some code segments as per Techhead's suggestions on github
- Adds changelog.
 2015-12-30 03:18:56 +01:00
Ccomp5950
ef8517417f Merge pull request #11817 from PsiOmegaDelta/151229-BumpDoor 
Resomi can now bump doors open.
 2015-12-29 17:57:36 -05:00
Kearel
d45da41095 Fixes #11661 
Basically the issue was that the obj in question was not an open
container.
Now it is.
 2015-12-29 15:12:07 -06:00
PsiOmegaDelta
ec488d2b46 Resomi can now bump doors open. 
QoL.
 2015-12-29 20:38:54 +01:00
Atlantis
605b78d377 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into NTOSv2 2015-12-29 20:25:34 +01:00
GinjaNinja32
b286d0c402 Merge pull request #11810 from PsiOmegaDelta/151229-PolarisDev 
Polaris Fixes
 2015-12-29 18:28:01 +00:00
Chinsky
163473a153 Merge pull request #11813 from PsiOmegaDelta/151229-ResomiBaseMob 
Can now spawn Resomi.
 2015-12-29 17:42:27 +03:00
Zuhayr
5fa5682e67 Merge pull request #11809 from GinjaNinja32/vv 
make VV list format clearer for assoc lists
 2015-12-30 00:05:44 +10:30
PsiOmegaDelta
6ed13d884c Merge pull request #11812 from Baystation12/dev-freeze 
Dev.
 2015-12-29 14:28:54 +01:00
PsiOmegaDelta
a9e1bab519 Can now spawn Resomi. 
QoL addition, little more.
 2015-12-29 14:27:34 +01:00
Zuhayr
4da9f6df70 Merge pull request #11767 from Loganbacca/devfix 
Fixed player setup issues
 2015-12-29 23:47:31 +10:30
PsiOmegaDelta
dbe840b32e Merge pull request #11811 from Baystation12/master 
Dev-freeze.
 2015-12-29 14:13:28 +01:00
Zuhayr
a2e96adefb Fix for brains ending up popping out of cryo consoles. 2015-12-29 14:03:58 +01:00
Zuhayr
b2a268ba0e Fixed weapon use by borgs. 2015-12-29 14:02:33 +01:00
GinjaNinja32
31c41f39b3 make VV list format clearer for assoc lists 2015-12-29 07:38:05 +00:00
GinjaNinja32
45d3d843f7 Merge pull request #11806 from Zuhayr/devfix 
Fixes.
 2015-12-29 07:06:31 +00:00
GinjaNinja32
865a25e0b5 work around BYOND bug causing #11785 
#11785
 2015-12-29 06:10:33 +00:00
Zuhayr
f7109f8fa8 Cleaning up some holder/scoop/climbing code. 2015-12-29 16:10:27 +10:30
GinjaNinja32
5296f7458a Merge pull request #11798 from Ccomp5950/sleepy_emotes 
Involuntary emotes no longer check if you are conscious.
 2015-12-29 04:56:34 +00:00
GinjaNinja32
60a6fe9513 Merge pull request #11799 from Ccomp5950/merge_fix 
Fix previous merge conflict oopsie.
 2015-12-29 04:55:49 +00:00
Loganbacca
b94fa98170 Tweaked a couple of fixes 2015-12-29 16:41:59 +13:00
ccomp5950
dd2db22e64 Fix previous merge conflict oopsie. 
1b10f78940
 2015-12-28 19:31:14 -05:00
ccomp5950
cf0320ee14 Involuntary emotes no longer check if you are conscious. 
Fixes: #11791

Unconcious folks don't scream.
 2015-12-28 18:40:44 -05:00
PsiOmegaDelta
66112636c8 Human blindness status should now be reset to 0 before any updates, preventing them from being left permanently blind. 
Fixes #11771.
 2015-12-28 22:38:58 +01:00
PsiOmegaDelta
91dbf027d0 Synths can now speak EAL. 2015-12-28 20:53:31 +01:00
PsiOmegaDelta
14381dfd87 Makes the AI/Malf status entries consistent with the rest of the mob stat entries. 2015-12-28 20:50:07 +01:00
PsiOmegaDelta
abfd7ac0d1 RCON consoles now use the same screen as on Master again. Fixes #11777, despite not really being a bug. 2015-12-28 20:45:00 +01:00
PsiOmegaDelta
82a51505cf The binary channel will now be listed using the user's primary language key, instead of : 2015-12-28 20:37:05 +01:00
PsiOmegaDelta
4d83861b85 Synths can now understand the language of the resomi. 
Fixes #11778.
 2015-12-28 20:15:17 +01:00
PsiOmegaDelta
b919181452 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/turfs/simulated/wall_attacks.dm
 2015-12-28 19:44:19 +01:00
GinjaNinja32
3dfb821eed add revision topic call 2015-12-28 17:25:37 +00:00
PsiOmegaDelta
949d3d0c7f Merge pull request #11770 from Baystation12/master 
Dev-feeeze
 2015-12-28 16:32:46 +01:00
Loganbacca
4b1f87ae12 Fixed dionae preview icon issues 2015-12-28 22:05:51 +13:00