Cheridan
31cfe0ba80
Merge pull request #3378 from Donkie/jobrefactor
...
Jobcode refactoring TAKE TWO
2014-04-09 13:52:37 -05:00
Daniel
c74edd9b42
MEIN GESPANNEN
2014-04-09 20:24:58 +02:00
Daniel
dd493117a7
Fixed merge conflict issues
2014-04-09 19:19:36 +02:00
Miauw62
fde4cfe4fd
Merge pull request #3323 from Ikarrus/signalorigin
...
Emergency Shuttle Signal Tracing
2014-04-09 18:51:18 +02:00
Daniel
30bb6c8814
Generalised ID naming
2014-04-09 18:49:59 +02:00
Daniel
03c1d7f673
Removed debugging code
2014-04-09 18:46:12 +02:00
Daniel
cd161aa6c0
Job refactoring done
2014-04-09 18:46:00 +02:00
Daniel
2a841c6dff
Further work on job refactoring
2014-04-09 18:43:30 +02:00
Daniel
67cd5fa847
Start of large job refactoring
2014-04-09 18:43:29 +02:00
Daniel
6c668c7c7b
Generalised PDA naming
2014-04-09 18:43:29 +02:00
Razharas
eb77aa6871
Merge pull request #3365 from Firecage/master
...
Standardised and Sensible circuitboard design names
2014-04-09 09:37:02 -07:00
Steelpoint
35950b90fd
SecMapChangeV3
2014-04-09 19:17:11 +08:00
Razharas
f44e3ffbf1
Merge pull request #3244 from MrPerson/qdel_tweaks_3-31-14
...
More qdel() changes
2014-04-08 15:37:44 -07:00
Razharas
eec07e23f7
Merge pull request #3355 from Ikarrus/mineralstorage
...
Mineral Storage Access
2014-04-08 09:53:28 -07:00
Ikarrus
81187c4243
Reverted Bartender Changes
2014-04-08 08:40:23 -06:00
Miauw62
6b19ab982a
Merge pull request #3361 from Perakp/tiny_prick_fix
...
Changeling bug fixes
2014-04-08 14:57:08 +02:00
Aranclanos
77829dbc9a
Merge pull request #3035 from Miauw62/warnstandardization
...
Standardizes and expands the warning() and error() procs.
2014-04-08 09:51:10 -03:00
Miauw62
c633d2e197
Merge pull request #3327 from Malkevin/gamemodedebug
...
Fixes my gamemode debugger
2014-04-08 14:49:39 +02:00
Miauw62
b97a61c11f
FUCK YOU GIITTTT ;_;
2014-04-08 14:47:05 +02:00
Miauw
5abb553f4a
Merge branch 'master' of https://github.com/tgstation/-tg-station into warnstandardization
...
Conflicts:
code/_onclick/telekinesis.dm
2014-04-08 14:29:58 +02:00
Firecage
aad822768f
Sensible circuit design names
...
Signed-off-by: Firecage <firecage@hotmail.com >
2014-04-08 14:09:40 +02:00
MrPerson
dd8891ef35
Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_tweaks_3-31-14
...
Conflicts:
code/game/machinery/camera/camera.dm
2014-04-08 04:53:05 -07:00
Cheridan
3acd999080
Merge pull request #3329 from phil235/DisposalPipeFix
...
Disposal bin deconstruction fix
2014-04-08 02:04:51 -05:00
Cheridan
bea449125b
Merge pull request #3354 from Ikarrus/doorelectronics
...
Updated the godawful Airlock Electronics interface
2014-04-08 01:44:37 -05:00
Razharas
03b34893d5
Merge pull request #3343 from Giacom/small_fixes
...
Fixes being able to change your chameleon jumpsuit's colour while dead.
2014-04-07 18:48:05 -07:00
Razharas
862f76c85f
Merge pull request #3331 from Giacom/danerfs
...
Nerf stats to the Genetic Power symptom.
2014-04-07 18:47:27 -07:00
Razharas
1b2e14eaa1
Merge pull request #3305 from Aranclanos/DoubleAgentsFinalWording
...
Double agents round-end message small change.
2014-04-07 18:41:17 -07:00
Razharas
4b57246f2c
Merge pull request #3300 from Ikarrus/renamenotice
...
Cyborgs notified of master AI renames
2014-04-07 18:40:38 -07:00
Razharas
42308da24d
Merge pull request #3298 from Kelenius/hydrofix
...
Fixing banana peel
2014-04-07 18:39:53 -07:00
Razharas
09c04a70c2
Merge pull request #3288 from phil235/ComputerBuildFix
...
Adds some messages during computer construction steps
2014-04-07 18:37:07 -07:00
Razharas
ac72bcaa37
Merge pull request #3283 from Aranclanos/Blueprints
...
Fixes blueprints not being able to generate a second area.
2014-04-07 18:36:36 -07:00
Razharas
c40458ab03
Merge pull request #3271 from GunHog/Cams_Upgrade
...
Replaces the carrot with the analyzer for upgrading cameras, also makes them easier to upgrade.[WIP]
2014-04-07 18:35:42 -07:00
Razharas
00c9e92b82
Merge pull request #3268 from Limeliz/patch-5
...
Fixes #3263/telekinetic grab showing up on examine
2014-04-07 18:33:51 -07:00
Razharas
4e7ac41ba4
Merge pull request #3346 from Iamgoofball/FUCKMONKEY
...
Removes a bunch of ticker.mode.name == "monkey" checks, since monkey doesn't even exist anymore
2014-04-07 18:30:30 -07:00
Firecage
73e8731f5b
Standardizing circuitboard design names
2014-04-07 23:01:56 +02:00
Cheridan
c9bd6c3688
Merge pull request #3296 from Ikarrus/alarmdelay
...
Alarm Delay Reduction
2014-04-07 14:04:50 -05:00
Razharas
8a9a1c3260
Merge pull request #3289 from Firecage/master
...
Morphing Clown Mask!
2014-04-07 11:10:26 -07:00
Cheridan
417a4ed070
Merge pull request #3333 from Giacom/config_allow_ooc
...
Added a configuration option that disables OOC during the round automatically.
2014-04-07 12:14:53 -05:00
Firecage
3531c1d169
Merge branch 'master' of git://github.com/tgstation/-tg-station
2014-04-07 19:01:35 +02:00
Perakp
ab6167b8c2
Changeling bug fixes
...
- Fixes #3192 , null reference on deleted monkey
- Fixes #3321 , changelings are now correctly unaffected by stings, but
can't tell if their sting was effective or not.
2014-04-07 18:32:20 +03:00
Cheridan
d0dc3f3af4
Merge pull request #3330 from phil235/Biogeneratorfix
...
Add message when loading container into the biogenerator
2014-04-07 05:00:01 -05:00
Cheridan
a9b24e42ab
Merge pull request #3342 from Giacom/emag_borgy
...
Fixes a bug with Cyborgs losing their emag module...
2014-04-06 21:47:55 -05:00
ikarrus
6dff6fa813
Added Mineral Storage access to CMO.
2014-04-06 16:30:19 -06:00
ikarrus
ae4a5482f0
Mineral Storage Access
...
Mineral Storage gives you access to the ore redemption machine, instead of keeping a list of req_one_access for various jobs. The intention is to make it easier to manage accesses and make it more clear who could use the machine.
Miners and their superiors now have access to the machine. If this becomes an issue I can adjust it.
Relabeled Mineral Storeroom access to Mineral Storage since the storeroom doesn't exist any more.
2014-04-06 15:40:46 -06:00
ikarrus
acf623eec7
Electronics will now remember if the airlock it was taken from was using req_one_access
2014-04-06 15:13:39 -06:00
ikarrus
f4c327ba26
Updated the godawful Airlock Electronics interface
...
Also added the ability to set if the door should require ALL listed accesses, or just one.
2014-04-06 15:04:31 -06:00
iamgoofball
810b91e7ac
removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists.
2014-04-06 11:46:12 -07:00
fleure
9db94d7c98
Merge pull request #3314 from Steelpoint/WaterTank
...
Increase's jani water tank's starting space cleaner supply
2014-04-06 17:16:06 +01:00
Giacomand
ce8baeabb9
Fixes being able to change your chameleon jumpsuit's colour while dead.
...
Fixed an oversight with the red syndicate suits in the random uplink kit.
2014-04-06 15:16:22 +01:00
Giacomand
e41dd607b5
Better comment.
2014-04-06 14:27:28 +01:00
