634e896e11
Merge branch 'master' into upstream-merge-37299
2018-04-27 09:22:31 +00:00
35e8ac1240
Merge pull request #6492 from Citadel-Station-13/upstream-merge-37364
...
[MIRROR] Removes the ability for inducers and circuits to charge energy weapons.
2018-04-27 09:21:07 +00:00
00ef1a9f84
Merge pull request #6488 from Citadel-Station-13/upstream-merge-37362
...
[MIRROR] Replaces plant/peel Crossed procs with the slippery component, where needed
2018-04-27 09:18:15 +00:00
c17d48affe
Merge pull request #6485 from Citadel-Station-13/upstream-merge-37359
...
[MIRROR] Fixes thermite immunities [s]
2018-04-27 09:17:43 +00:00
d679d27766
Merge pull request #6505 from Citadel-Station-13/upstream-merge-37378
...
[MIRROR] Fixes brain tumor. Again.
2018-04-27 00:12:14 -05:00
4647168c78
Merge pull request #6504 from Citadel-Station-13/upstream-merge-37379
...
[MIRROR] Fixes duplicate logic causing doors to be perma stuck on shock mode.
2018-04-27 00:11:59 -05:00
df90ab6fb9
Merge pull request #6503 from Citadel-Station-13/upstream-merge-37371
...
[MIRROR] GetFlatIcon fix
2018-04-27 00:11:11 -05:00
72ddaee4a3
Merge pull request #6502 from Citadel-Station-13/upstream-merge-37363
...
[MIRROR] Makes radiation collectors buildable
2018-04-27 00:10:52 -05:00
a4bc2c0b95
Merge pull request #6500 from Citadel-Station-13/upstream-merge-37398
...
[MIRROR] Fixes cargo scanner being invis.
2018-04-27 00:09:17 -05:00
d496d78169
Merge pull request #6486 from Poojawa/4-22-sync
...
Hard TG Sync 4/22
2018-04-27 00:08:38 -05:00
132ae3a657
what the fuck is this shitcode
2018-04-26 09:28:34 -04:00
2a40af1bf2
Fixes a thing ( #37427 )
2018-04-25 13:29:13 -05:00
1ba045e5f5
Fixes brain tumor. Again. ( #37378 )
2018-04-24 09:58:36 -05:00
e748439b15
Fixes duplicate logic causing doors to be perma stuck on mike pence mode. ( #37379 )
2018-04-24 08:14:12 -05:00
3c36c1acfc
GetFlatIcon fix ( #37371 )
2018-04-24 07:20:39 -05:00
d5c2d37e39
Makes radiation collectors buildable ( #37363 )
...
* Makes radiation collectors buildable
* capitalism at it's finest
* a
2018-04-24 07:13:16 -05:00
a88caf87aa
Fixes cargo scanner being invis.
2018-04-23 18:28:41 -05:00
1cdea15616
Fixes ghosts being unable to see into nonadjacent bags
2018-04-23 09:03:27 -05:00
e52fafcbb7
Merge pull request #37364 from Jalleo/Inducer_change
...
Removes the ability for inducers and circuits to charge energy weapons.
2018-04-23 08:47:55 -05:00
c7e3b72888
It started in a tavern on the edge of Macke town ( #37362 )
2018-04-23 07:35:09 -05:00
0d5d992732
compile fixes + initial map port
2018-04-23 03:37:10 -05:00
832f071b59
mob stuff
2018-04-23 02:26:53 -05:00
1d3f9bd4ec
Fixes thermite immunities ( #37359 )
2018-04-23 02:06:22 -05:00
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
cc6b320f83
game folder
2018-04-23 00:17:28 -05:00
e5f9765d2a
datums/controller stuff
2018-04-23 00:02:42 -05:00
f2b0456dc5
defines, helpers, onclick
2018-04-22 23:56:25 -05:00
e97db8a33c
Merge pull request #6481 from Citadel-Station-13/upstream-merge-37339
...
[MIRROR] Fixes a lack of feedback when entering too many points for the gulag.
2018-04-22 22:23:07 -05:00
86e3cac966
Merge pull request #6480 from Citadel-Station-13/upstream-merge-37324
...
[MIRROR] Makes engine goggle numbers more visible
2018-04-22 22:22:38 -05:00
fb267270ec
Merge pull request #6478 from Citadel-Station-13/upstream-merge-37315
...
[MIRROR] Gives beer and soda dispensers their own circuitboards and Design ID's
2018-04-22 22:22:03 -05:00
de2ab536d1
Merge pull request #6477 from Citadel-Station-13/upstream-merge-37320
...
[MIRROR] Fixes pAI's breaking drone static.
2018-04-22 22:21:45 -05:00
f3fb253713
Merge pull request #6476 from Citadel-Station-13/upstream-merge-37321
...
[MIRROR] Fixes CTF cheating
2018-04-22 22:21:21 -05:00
8170e2b6c1
Merge pull request #6475 from Citadel-Station-13/upstream-merge-37314
...
[MIRROR] Mapping component helper
2018-04-22 22:20:58 -05:00
4226fa8b27
Merge pull request #6474 from Citadel-Station-13/upstream-merge-37305
...
[MIRROR] Adds a note if the loaded away mission is custom in the logs.
2018-04-22 22:20:39 -05:00
7bf8b9654e
Merge pull request #6473 from Citadel-Station-13/upstream-merge-37306
...
[MIRROR] Fixes falsewall letting through air.
2018-04-22 22:20:22 -05:00
174a1d01ab
Merge pull request #6472 from Citadel-Station-13/upstream-merge-37310
...
[MIRROR] Fixes and optimises apc_control.dm a tad.
2018-04-22 22:20:01 -05:00
7f90eaf89c
Merge pull request #6471 from Citadel-Station-13/upstream-merge-36270
...
[MIRROR] [READY] A few additions, tweaks, and fixes for integrated circuits
2018-04-22 22:19:28 -05:00
73e798b281
Merge pull request #6470 from Citadel-Station-13/upstream-merge-37304
...
[MIRROR] Fixes buildmode trying to build in nullspace.
2018-04-22 22:19:06 -05:00
7cc2aeea8f
Merge pull request #6469 from Citadel-Station-13/upstream-merge-37301
...
[MIRROR] Flatten the map transition edges
2018-04-22 22:18:47 -05:00
af48fe9dcf
Fixes a lack of feedback when entering too many points for the gulag. ( #37339 )
2018-04-22 19:42:47 -05:00
b36d88900f
Makes engine goggle numbers more visible ( #37324 )
2018-04-22 19:21:13 -05:00
e8698ab798
Gives beer and soda dispensers their own circuitboards and Design ID's ( #37315 )
...
* new boards
* new boards installed
* new designs (wow) (woah)
* added the new design ids to the biotech node
* tested
it works, also, that typo fucking stopped it from compiling
2018-04-22 19:19:51 -05:00
e36c44be5c
Fixes pAI's breaking drone static. ( #37320 )
2018-04-22 19:19:43 -05:00
0c6aea73d3
Can't push CTF flag carriers ( #37321 )
2018-04-22 19:19:32 -05:00
8a3caaae6b
Mapping component helper ( #37314 )
...
* Mapping component helper
* GetAllContents so you can manipulate things in crates/onmobs/whatever
* More verbose warning.
2018-04-22 19:18:17 -05:00
54ef24b75a
Adds a note if the loaded away is custom or not in the logs. ( #37305 )
2018-04-22 19:17:05 -05:00
1c390cbbc5
Fixes falsewall letting through air. ( #37306 )
...
* Fixes falsewall letting through air.
* define
2018-04-22 19:15:51 -05:00
70a0db6173
Merge pull request #37310 from Jalleo/apc_control_changes
...
Fixes and optimises apc_control.dm a tad.
2018-04-22 09:31:10 -05:00
e022564fca
Merge pull request #6467 from Citadel-Station-13/upstream-merge-37300
...
[MIRROR] fixes skateboards giving infinite metal
2018-04-22 02:47:07 -05:00
2b70e9a3ae
Merge pull request #6466 from Citadel-Station-13/upstream-merge-37312
...
[MIRROR] [s] You can no longer buckle anchored mobs to things.
2018-04-22 02:46:53 -05:00
deathride58