Zuhayr
7dfbcdae68
Switched some if(mutation) to if(sdisability)
2013-12-25 22:14:31 +10:30
Zuhayr
72727e58d5
Forgot a tilde.
2013-12-23 11:18:00 +10:30
Zuhayr
28df8b73b2
Added deactivate() for midget power.
2013-12-23 11:15:29 +10:30
Zuhayr
cc1c1e2973
Changed disability removal to bitmask operators rather than -= as per Chinsky's posts in the diff.
2013-12-23 10:36:36 +10:30
Zuhayr
ff52920fab
DNA2 fixes cherrypicked from N3X15.
2013-12-23 00:06:56 +10:30
Zuhayr
d783fd5043
Manual binary merge of head icons.
2013-12-22 23:23:25 +10:30
Zuhayr
b9fcd34df3
Merged config and changelog.
2013-12-22 23:11:29 +10:30
Ravensdale
9d9c797135
changes pushed to master branch instead of dev
2013-12-21 07:31:43 -08:00
Zuhayr
bb602139b0
Merge pull request #4074 from fauxki/dev
...
Centcom Update + Minor Updates
2013-12-20 10:35:57 -08:00
fauxki
247cae41a1
Adds in the red shoes I forgot to put into the closet that has all the colored shoes in it.
2013-12-20 01:29:13 -08:00
Asanadas
1ae17bb724
Merge pull request #4073 from Zuhayr/borertweaks
...
Borer tweaks/additions. Borers for the Borer God.
2013-12-19 18:17:44 -08:00
Zuhayr
b0b038873f
Medical HUDs will now only show brainworms if the worm is controlling the host.
2013-12-19 11:00:21 +10:30
Zuhayr
11f8a5835f
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-12-19 00:01:12 +10:30
Mloc
19d33bc2ee
Merge pull request #4065 from SkyMarshal/patch-4
...
Ghosts can see PDA messages.
2013-12-18 05:26:41 -08:00
Zuhayr
59f35ade32
Added borer checks to handheld and advanced scanners.
2013-12-18 15:05:32 +10:30
Zuhayr
c5849aaa96
Added cortical borers to the various HUDs.
2013-12-18 14:03:04 +10:30
SkyMarshal
4e4ee34ec8
Herp derp
2013-12-17 20:24:00 -07:00
Zuhayr
f8ebd9d5de
Added checks for borers to various key-swapping powers to prevent weirdness.
2013-12-18 13:49:10 +10:30
Zuhayr
b4e11a6ff9
Possible fix for #3712
2013-12-18 11:51:20 +10:30
Zuhayr
924a7af50a
Fixes #4034
2013-12-18 11:17:17 +10:30
Zuhayr
6984ba3fec
Fixes #4040
2013-12-18 11:10:00 +10:30
Zuhayr
8d76690f44
Fixes #4042
2013-12-18 10:30:59 +10:30
Zuhayr
0695774d24
Fixes #4050
2013-12-18 01:04:52 +10:30
Chinsky
b3248bf914
Merge pull request #4060 from DJSnapshot/dev-freeze
...
Improvements to how floors become dirty
2013-12-16 22:12:54 -08:00
DJSnapshot
b79ad45087
De-clunking the revised dirt code.
2013-12-16 22:07:31 -08:00
SkyMarshal
e03f475b18
Ghosts can see PDA messages.
2013-12-16 20:48:00 -07:00
DJSnapshot
e112820ead
Improvements to floors becoming dirty. They now become dirty over time instead of suddenly being really dirty at 50 steps.
2013-12-15 22:58:10 -08:00
Zuhayr
824b871902
Fixes the nuke suit spawn proc.
2013-12-15 14:50:24 +10:30
Zuhayr
92c4d6c66c
Nook ops species-specific hardsuits on spawn.
2013-12-15 13:18:32 +10:30
Zuhayr
7940ac6cda
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-12-13 12:48:25 +10:30
DJSnapshot
a8eebd17d0
Grammar fix and fix to c45 being declared twice in boxes.dm
2013-12-08 12:25:00 -08:00
Zuhayr
502e39e341
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-12-08 12:22:31 +10:30
Ccomp5950
fea1819260
Runtime fix: It was a bad idea to have this stuff in New()
...
So now it gives a default values and moves on.
2013-12-07 05:17:04 -06:00
Zuhayr
17380e308e
Extra check in secure case interaction for aliens.
2013-12-05 22:04:11 +10:30
Zuhayr
ced5cf2020
Actually fixes #4030 , previous commit fixes #4014
2013-12-05 21:59:12 +10:30
Zuhayr
a110cfaed7
Fixes #4030
2013-12-05 21:58:33 +10:30
Zuhayr
78e09f33d1
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2013-12-05 21:32:23 +10:30
Zuhayr
b3c0079e18
Merge pull request #4004 from volas/master
...
Minor fixes
2013-12-05 02:56:06 -08:00
Zuhayr
edabf18323
Merge pull request #4012 from N3X15/dna2
...
DNA2 - A recode of DNA
2013-12-05 02:39:55 -08:00
Chinsky
9938c152ff
Merge pull request #4023 from Zuhayr/feature
...
Ability skeleton code, basic cryopod functionality.
2013-12-04 13:50:17 -08:00
Ccomp5950
52d328623a
Tanks will also keep up with who manipulated them last.
...
Tanks placed in canisters, scanned with PDA or other analysis tool will set the manipulated_by variable to whoever did so.
The idea is that this person is aware what's in the tank and will act accordingly when you press the internals HUD icon.
If the user was the last person to manipulate the tank (or it's not been manipulated) then the user is smart about selecting the proper tank.
If the user was not the last person to manipulate the tank then he is only checking the pressure gauge to see what tank is fullest that matches his species breath_type
If that tank has nasties in it, welp he is going to get a breathful of nasties.
2013-12-03 23:01:42 -06:00
Kilakk
d2c07184f7
Merge remote-tracking branch 'upstream/dev' into dev-radio
...
Conflicts:
maps/tgstation2.dmm
2013-12-03 21:24:03 -05:00
Chinsky
0074452f29
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev
2013-12-03 19:42:17 +04:00
Zuhayr
0a0a71a66c
Added cryo log, item recover strings and various bits and bobs to cryopods. Restored 9000 tick delay on use.
2013-12-03 22:31:22 +10:30
Zuhayr
b35e8cd8fb
Added cryopod console with item recovery.
2013-12-03 22:05:35 +10:30
Zuhayr
411308b287
Added item preservation, cryo announcements and a minimum timer to cryopods.
2013-12-03 21:28:30 +10:30
Zuhayr
7effb3a909
Basic functionality for crypod despawners.
2013-12-03 04:21:37 +10:30
Zuhayr
69d84931e6
Changelog merge resolution.
2013-12-03 01:07:17 +10:30
Ccomp5950
624068cc4f
Emergency Insertion - Supermatter Manual.
...
/obj/item/weapon/book/manual/supermatter_engine
2013-12-01 19:31:25 -06:00
Kilakk
13abdf9fdc
Moved the CentComm channels onto their own tcomm network thing
...
* 144.1 and 144.3 are accessible through regular headsets, silly people were using them to listen in on response teams
* Moved the ERT and Deathsquid channels to 134.5 and 134.1 respectively
* Created presets for a tcomms setup on the CentComm zlevel
2013-12-01 18:58:16 -05:00
