07bbc4d3af
Actually links mineral sprites with their new location ( #37564 )
...
Fixes sprites being broken
2018-04-29 19:06:14 -05:00
2ca75d7de7
added fly and moth categories to limb grower and limbgrower_designs.dm ( #37349 )
...
only human and lizard synthetic limbs will have should_draw_greyscale set to true
added /improper and uncapitalised synthetic limb names
removed plasmaman parts from human_parts_greyscale.dmi
2018-04-29 17:52:44 -05:00
6f13d2c2e9
Merge pull request #6546 from Citadel-Station-13/upstream-merge-37380
...
[MIRROR] Refactors and fixes RPEDs
2018-04-29 22:45:28 +00:00
f373b2c9e6
Kills off three more flags from flags_2
2018-04-29 17:30:55 -05:00
814dc3f811
fixes a pacifism kill through crushing firelocks! ( #37511 )
...
* fix!
* ORANGES LOOK AWAY
* thanks maintainer
2018-04-29 10:09:29 -05:00
c287c3a84c
Merge pull request #6548 from Citadel-Station-13/upstream-merge-37483
...
[MIRROR] Fixes obj descs and adds missing ones
2018-04-29 02:29:44 -05:00
71b362e41e
Merge pull request #6547 from Citadel-Station-13/upstream-merge-37473
...
[MIRROR] Lets quantum pads be used by sillycones properly.
2018-04-29 02:29:05 -05:00
f606430d2b
Merge pull request #6545 from Citadel-Station-13/upstream-merge-37478
...
[MIRROR] [s] Fixes turret exploits
2018-04-29 02:28:14 -05:00
53ee2ab0a9
Merge pull request #6543 from Citadel-Station-13/upstream-merge-37465
...
[MIRROR] Adds logging for PDA explosions
2018-04-29 02:25:10 -05:00
db142667b7
Merge pull request #37501 from ShizCalev/icon-fixes
...
Fixes missing icons
2018-04-28 14:54:45 -05:00
803d3b59fd
Merge pull request #6556 from Citadel-Station-13/upstream-merge-37497
...
[MIRROR] Replaces a / with * as per Contributing.md [bscrystal.dm]
2018-04-28 14:07:24 -05:00
b565ef9171
Merge pull request #6557 from Citadel-Station-13/upstream-merge-37384
...
[MIRROR] Re-adds and reworks fusion.
2018-04-28 14:07:08 -05:00
3f6167d08e
Moves several clothing-specific flags from /atom to their proper type
2018-04-28 13:21:48 -05:00
811cc06188
Merge pull request #6536 from Citadel-Station-13/upstream-merge-37436
...
[MIRROR] Adds a stationloving component to replace a couple of flags and SSinbounds with
2018-04-28 01:36:04 -05:00
9b36d6c4d9
Re-adds and reworks fusion. ( #37384 )
...
add: Fusion is back
add: Fusion now happens with large quantities of hot plasma and CO2, consuming all the plasma rapidly and producing large amounts of energy. Other gases can also effect the performance of the reaction.
add: Fusion now produces radiation. Be careful around reactors.
fix: fixes fusion dividing by zero and destroying everything
code: Gas reactions now have access to where they are occurring
fix: Prevents some other reactions from producing matter from nothing
2018-04-28 01:01:47 -05:00
74a483d350
Merge pull request #37497 from ExcessiveUseOfCobblestone/patch-42
...
Replaces a / with * as per Contributing.md [bscrystal.dm]
2018-04-27 21:21:59 -05:00
2b2ff05b73
Modified bomb and syndicate bomb spawner so Cuban Pete bombs maxcap and work again
2018-04-27 20:28:55 -05:00
6ed120aad4
NTNet improvements!
2018-04-27 20:24:28 -05:00
7d45e045a3
Uppercases slot defines.
2018-04-27 20:14:39 -05:00
b368ab377b
fixes obj descs and adds new ones ( #37483 )
2018-04-27 13:21:08 -05:00
73d5c92c2b
Quantum pad interaction ( #37473 )
2018-04-27 13:17:52 -05:00
4850230fc4
Refactors and fixes RPEDs
2018-04-27 13:13:37 -05:00
185a6c4a90
Fixes turret exploits ( #37478 )
2018-04-27 13:12:24 -05:00
6ea9eaf06d
Adds logging for PDA explosions ( #37465 )
...
* Adds logging for PDA explosions
* Adds antag status
2018-04-27 13:11:02 -05:00
ab3c55ab23
replaces randomized wires with departmental wires ( #6376 )
2018-04-27 07:42:09 -07:00
862898526d
Gamemode and gamemode vote obfuscation (Plus hub entry rework) ( #6276 )
...
* adds gamemode/gamemode vote obfuscation, redesigns hub entry
* ternaries: the easiest way to obfuscate your code to the point where even you can't read it
* FUCK
* changes the inaccuracy chance from 1/10 to 1/5
2018-04-27 07:40:45 -07:00
d6b48869d8
Adds a stationloving component to replace a couple of flags and SSinbounds with ( #37436 )
...
* station lovin' happened so fast
* Update stationloving.dm
* less qdel memes
* imbue soul signal
* rename imbue soul signal
* dupemode
* henk
* Update atoms_movable.dm
* Update nuclearbomb.dm
* Update nuclearbomb.dm
2018-04-27 07:37:15 -05:00
532ccc412c
Merge pull request #6532 from Citadel-Station-13/upstream-merge-37373
...
[MIRROR] Fixes missing augmentation hands
2018-04-27 09:42:46 +00:00
52e35b230f
Merge pull request #6529 from Citadel-Station-13/upstream-merge-37441
...
[MIRROR] Analyzers show temperature in Kelvin as well as Celsius now
2018-04-27 09:41:46 +00:00
d972ecc891
Merge pull request #6523 from Citadel-Station-13/upstream-merge-37407
...
[MIRROR] Removes Acid from Remaining Circuits
2018-04-27 09:39:29 +00:00
2ee4d3e77d
Merge pull request #6515 from Citadel-Station-13/upstream-merge-37326
...
[MIRROR] Removes SCP_294
2018-04-27 09:35:43 +00:00
13c28b9ff1
Merge pull request #6513 from Citadel-Station-13/upstream-merge-37403
...
[MIRROR] Adds grind_results to coins and diamonds
2018-04-27 09:34:49 +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
848d0564d1
Merge branch 'master' into upstream-merge-37381
2018-04-27 09:19:52 +00:00
9e3f99092f
Fixes missing augmentation hands ( #37373 )
2018-04-27 02:42:13 -05:00
18716c03a5
Analyzers show temperature in Kelvin as well as Celsius now ( #37441 )
...
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089 )
* wew
* nicbn
2018-04-27 02:28:21 -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
4838bfec4e
Merge pull request #37407 from Fox-McCloud/circuits-reagents
...
Removes Acid from Remaining Circuits
2018-04-26 15:24:26 -05:00
132ae3a657
what the fuck is this shitcode
2018-04-26 09:28:34 -04:00
17aa0acef8
Removes SCP_294 ( #37326 )
...
* aaah sweet essence
* bye bye sprites
* goodbye machine code
* bye bye blacklist entry
* whoops
* scp gone from runtime
* bye bye ract
* bye bye space ruin folder
* bye bye area
2018-04-25 10:05:57 -05:00
d2885c84b7
adds grind_results to coins and diamonds ( #37403 )
2018-04-25 06:04:18 -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
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
0127fa02cd
Fixes toolbelts holding everything
2018-04-23 08:30:08 -05:00
0d5d992732
compile fixes + initial map port
2018-04-23 03:37:10 -05:00
cc6b320f83
game folder
2018-04-23 00:17:28 -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
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
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
af48fe9dcf
Fixes a lack of feedback when entering too many points for the gulag. ( #37339 )
2018-04-22 19:42:47 -05:00
pigeons