cc33872399
Merge pull request #5873 from Citadel-Station-13/upstream-merge-36083
...
[MIRROR] Pillbottles can now be made
2018-03-09 20:41:26 +00:00
2c34acc034
Merge pull request #5853 from Citadel-Station-13/upstream-merge-35475
...
[MIRROR] [reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-09 20:36:58 +00:00
2686699c3e
Pillbottles can now be made ( #36083 )
2018-03-09 14:24:35 -06:00
6b8213fff1
Merge pull request #5871 from Citadel-Station-13/upstream-merge-36258
...
[MIRROR] Makes the smoke machine deconstructable
2018-03-09 19:39:28 +00:00
a62aa577f1
Merge pull request #5854 from Citadel-Station-13/upstream-merge-36055
...
[MIRROR] Techwebs update: Protolathe/Circuit imprinters combined into techfabs!
2018-03-09 19:25:12 +00:00
bc5447d97b
Merge pull request #5857 from Citadel-Station-13/upstream-merge-35947
...
[MIRROR] [READY] NTNet airlocks
2018-03-09 19:24:35 +00:00
c66b390cc1
Moves arousal meter to compensate for mood display
2018-03-09 14:23:49 -05:00
936c6a33f2
Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475
2018-03-09 14:18:47 -05:00
7650336507
Merge pull request #36258 from vuonojenmustaturska/bepis
...
Makes the smoke machine deconstructable
2018-03-09 12:48:31 -06:00
aa0dbb5603
Merge pull request #5850 from Citadel-Station-13/upstream-merge-36070
...
[MIRROR] Beacons are no longer radios
2018-03-09 18:41:05 +00:00
c615d9e6a0
Merge pull request #5870 from Citadel-Station-13/upstream-merge-36252
...
[MIRROR] Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
2018-03-09 18:40:24 +00:00
fdbd8aec97
Merge pull request #5869 from Citadel-Station-13/upstream-merge-36288
...
[MIRROR] You can no longer SDQL select certain datums
2018-03-09 18:40:09 +00:00
a4751b0e94
Merge pull request #5868 from Citadel-Station-13/upstream-merge-36289
...
[MIRROR] [s] Stop qdeling shit you're not supposed to
2018-03-09 18:39:51 +00:00
2a92653e68
Merge pull request #5867 from Citadel-Station-13/upstream-merge-36290
...
[MIRROR] [s] Guards client.holder
2018-03-09 18:39:35 +00:00
8728d99ef9
Merge pull request #5866 from Citadel-Station-13/upstream-merge-36287
...
[MIRROR] [S] Fixes GLOB protected vars exploit
2018-03-09 18:39:19 +00:00
f10552f7ef
Update ntnet_interface.dm
2018-03-09 13:37:55 -05:00
1387c8e3b6
Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858
...
[MIRROR] Mushroom people, revived!
2018-03-09 18:37:29 +00:00
78db80026d
Merge pull request #5840 from Poojawa/reverts-crybaby-inducer
...
Reverts crybaby inducer also does the sync things
2018-03-09 18:36:42 +00:00
1995f00032
Merge pull request #36252 from kevinz000/patch-463
...
Sigils of transmission are no longer as eye-candy but also no longer as much of a CPU-sink
2018-03-09 11:04:28 -06:00
bf63e9ad3f
Merge pull request #36288 from Cyberboss/BansKevinzFinally
...
You can no longer SDQL select certain datums
2018-03-09 10:45:58 -06:00
ba5b5b433e
Merge pull request #36289 from tgstation/Cyberboss-patch-4
...
[s] Stop qdeling shit you're not supposed to
2018-03-09 10:44:46 -06:00
f25ed2503e
Merge pull request #36290 from tgstation/Cyberboss-patch-5
...
[s] Guards client.holder
2018-03-09 10:28:17 -06:00
27928bb1bf
Merge pull request #36287 from tgstation/Cyberboss-patch-4
...
[S] Fixes GLOB protected vars exploit
2018-03-09 09:07:35 -06:00
ad0be11cbc
Merge pull request #5865 from Citadel-Station-13/upstream-merge-36073
...
[MIRROR] [READY AND TESTED]Projectiles now properly delete themselves if they try to move and their trajectory is at an invalid turf
2018-03-09 04:53:41 -06:00
2f2aed48e4
Merge pull request #5864 from Citadel-Station-13/upstream-merge-36051
...
[MIRROR] The ARM is now harder to obtain
2018-03-09 04:53:23 -06:00
5ac9ce4a02
Merge pull request #5863 from Citadel-Station-13/upstream-merge-36058
...
[MIRROR] Display cases can now have a list where to randomly spawn items from
2018-03-09 04:53:10 -06:00
f207fe1f08
Merge pull request #5862 from Citadel-Station-13/upstream-merge-36233
...
[MIRROR] Adds explicit check for numberless backpack contents in outfits.
2018-03-09 04:52:46 -06:00
0e2531faaf
Merge pull request #5861 from Citadel-Station-13/upstream-merge-36106
...
[MIRROR] To go even further byond... the above lighting layer!
2018-03-09 04:52:32 -06:00
c86aeef909
Merge pull request #5860 from Citadel-Station-13/upstream-merge-36195
...
[MIRROR] Minor say code cleanup
2018-03-09 04:52:18 -06:00
0905f68bbc
Projectiles delete on invalid turf ( #36073 )
2018-03-09 02:26:05 -06:00
e9d3af6e61
The ARM is now harder to obtain ( #36051 )
...
* Added ARM difficulty
* Working edition Pt1
* Actually working Pt2
* Appropriate null check?
* Update narsie.dm
2018-03-09 02:17:46 -06:00
27ff0a4f28
Display cases can now have a list where to randomly spawn items from ( #36058 )
...
* Adds allowing display cases to pick from a random list
Keeps compatibility with older maps and moves trophy/plaque message to all display cases
* A bit more legible
* Refactors statues tool interaction code
* Don't override it already exists
* done
2018-03-09 02:17:36 -06:00
cc691e16a1
Merge pull request #36233 from AnturK/nulllove
...
Adds explicit check for numberless backpack contents in outfits.
2018-03-08 23:21:28 -06:00
e8548b392b
To go even further byond... the above lighting layer! ( #36106 )
...
* This, is my normal form.
* THIS, IS A SUPER SAIYAN ASCENDED.
I CALL IT A SUPER SAIYAN 2
* Update lighting.dm
* Spelling correction (#3 )
* Update layers.dm
* Update chunk.dm
* TO GO BYOND....
* Update lighting.dm
2018-03-08 22:43:23 -06:00
8c87527005
Minor say code cleanup
2018-03-08 22:43:15 -06:00
423302ac3c
Merge pull request #36217 from Cruix/disease_freemove
...
Sentient diseases get 2 minutes to select their initial host
2018-03-08 22:42:57 -06:00
f0cf4ad29d
[READY] NTNet airlocks
2018-03-08 22:42:46 -06:00
a80ab73951
Update net_snare.dm
2018-03-08 01:09:05 -05:00
0f0ab49648
Update species.dm
2018-03-08 01:03:56 -05:00
91d1aa5a74
Update flavor_misc.dm
2018-03-08 01:02:29 -05:00
28f886791d
Update mobs.dm
2018-03-08 01:01:42 -05:00
56845788ac
Merge pull request #5817 from Zna12/Filet-o-fish
...
Filet-O-Sharkpeople
2018-03-08 05:59:01 +00:00
1850af961d
Merge pull request #5852 from Citadel-Station-13/upstream-merge-36198
...
[MIRROR] Disease fixes
2018-03-08 05:58:11 +00:00
fae68e4122
Merge pull request #5851 from Citadel-Station-13/upstream-merge-36202
...
[MIRROR] Small spellcheck in traits
2018-03-08 05:57:39 +00:00
f836affa2e
Merge pull request #5842 from Citadel-Station-13/upstream-merge-36191
...
[MIRROR] Allow configuring ruin/empty space level count
2018-03-08 05:57:03 +00:00
828322d870
Merge pull request #5841 from Citadel-Station-13/upstream-merge-36190
...
[MIRROR] Removes DEBUG from compile_options.
2018-03-08 05:56:37 +00:00
e559fdca2c
Mushroom people, revived!
2018-03-07 21:47:42 -06:00
91ac70a73e
RND TECHWEBS: TECHFABS ( #36055 )
...
Doing my little update piece by piece because I'm lazy and because storage PR is going to conflict everything ever.
Techfabs do not link to RND consoles, and have their own interface for producing things.
RND production machinery code refactored.
Techwebs have categories views instead of just a goddamn design list.
Old machinery will be kept in, as some places will keep them. Read: Engineering, robotics, etc.
experimental: Protolathes and circuit imprinters combined/changed to techfabs. All departments can now print related circuit boards. Engineering and science will keep their lathe/imprinter design by default at roundstart because they have specialized labs for those.
2018-03-07 21:11:56 -06:00
a96a28f3d6
[reviewpls] Adds moodlets to the game - [Please give suggestions for trait additions in comments]
2018-03-07 20:49:25 -06:00
5cfc5f3730
Merge pull request #36198 from Cruix/disease_fixes
...
Disease fixes
2018-03-07 16:04:14 -06:00
deathride58