8b48cab574
Merge pull request #13233 from Hatterhat/za-hando
...
[READY] za hando - a pr about ling claws and punching shit
2020-10-10 21:59:05 -07:00
ad32b8f437
Merge pull request #13472 from timothyteakettle/slime-puddle
...
the pr that lets slimes turn into useless puddles
2020-10-10 11:14:25 -07:00
d8b39bcc5f
Merge pull request #13405 from silicons/tracer
...
warp implant is now infinite use and now actually reverts your position to 10 seconds before in time rather than use a snowflake chemical to teleport you 5 seconds later
2020-10-10 11:02:30 -07:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
385bd57940
reworks family heirlooms, adds heirlooms that can be based off your species ( #13444 )
...
* corgi tracker
* better heirloom system
* typo
2020-10-10 12:15:39 +02:00
e2c6a19da7
Merge branch 'master' into slime-puddle
2020-10-07 23:37:30 +01:00
56a7499cef
Merge pull request #13496 from Detective-Google/deadchat-kablooey
...
allows players in deadchat to see explosions
2020-10-06 17:05:06 -07:00
3fa0bf37ff
Merge pull request #13501 from Putnam3145/fix-firelocks
...
Made holofirelocks work.
2020-10-06 17:04:01 -07:00
efc4e089c9
Merge pull request #13503 from Hatterhat/glaive-knuckledagger
...
survival daggers, luxpod capsule resprite, glaive sprite tweaks soon (tm)
2020-10-06 17:03:44 -07:00
755e539bf3
Merge pull request #13523 from Detective-Google/patch-2
...
fixes arcade carpet
2020-10-06 17:01:59 -07:00
a2889c90f1
Merge pull request #13512 from Hatterhat/cryoscreech-fix
...
cant believe nobody realized the issue - fixes cryo announcements
2020-10-06 09:57:34 -07:00
260ed6eff6
fixes arcade carpet
2020-10-05 21:27:42 -05:00
6d14d37e5f
adds deadchat span
2020-10-04 13:34:36 -05:00
9faff5ecb6
Merge pull request #13461 from Detective-Google/arcade-carpets
...
adds arcade carpets
2020-10-03 18:07:44 -07:00
27ae95dd26
Merge pull request #13499 from Putnam3145/toilet-loot-fix
...
Makes toilet loot not exist to cause bad GC bugs.
2020-10-03 18:07:10 -07:00
7586c38d52
Merge pull request #13487 from DeltaFire15/borg-KA-upgrade-fix
...
Fixes borg KA upgrade installation
2020-10-03 18:03:11 -07:00
d2657efefc
its not tested but w/e
2020-10-03 17:54:07 -05:00
0393ffe0c3
Merge pull request #13489 from timothyteakettle/species-color-define
...
standardizes minimum brightness of mutant parts
2020-10-03 14:21:20 -07:00
6a8814cd1e
Merge pull request #13484 from DeltaFire15/plushling-fix
...
Fixes plushlings
2020-10-03 14:20:33 -07:00
051b81c574
Merge pull request #13485 from DeltaFire15/neovgre-oopsie
...
[s] Fixes a tiny Neovgre edge case
2020-10-03 14:20:24 -07:00
4195f96876
glaive daggers squashed
2020-10-03 14:32:19 -05:00
138794378d
Made holofirelocks work.
2020-10-02 22:34:05 -07:00
29213bbcbe
ok i guess it has to be initialize
2020-10-02 17:39:53 -07:00
3b21c31872
Makes water closet loot work and not cause bad GC bugs.
2020-10-02 16:56:21 -07:00
52e8e2996c
allows players in deadchat to see explosions
2020-10-02 14:26:11 -05:00
950cb05617
Merge remote-tracking branch 'upstream/master' into slime-puddle
2020-10-02 15:53:48 +01:00
f6dccd5ac5
Merge pull request #12439 from timothyteakettle/cool-ipcs
...
makes ipcs more like robots (a partial port from skyrat)
2020-10-01 14:15:04 -07:00
7726b0456c
Merge branch 'master' into cool-ipcs
2020-10-01 21:06:16 +01:00
57132d0b32
Merge remote-tracking branch 'upstream/master' into clothing
2020-10-01 14:06:21 -05:00
98703e6ad6
Merge remote-tracking branch 'upstream/master' into arcade-carpets
2020-10-01 13:41:10 -05:00
e1123ad7fe
color define
2020-10-01 18:55:32 +01:00
e012b8f082
typo
2020-10-01 17:18:28 +02:00
d54a899695
fixes KA modkits being installed in borgs by others
...
These have been broken for so long holy fuck
2020-10-01 17:13:03 +02:00
c8d6f3d22a
Merge pull request #13477 from LetterN/patch-2
...
Adds craftable railings
2020-10-01 03:13:51 -07:00
d8e58b1c48
Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
...
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
4dd9f20d22
Merge pull request #13470 from EmeraldSundisk/skelter
...
Helter-Skelter.
2020-10-01 03:09:51 -07:00
38c25bdc9d
Merge pull request #13466 from Putnam3145/sdgf-fix
...
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
7553508a2a
Merge pull request #13455 from Putnam3145/pyroclastic-policy
...
Added policy config for sentient pyro slimes (no actual policy yet)
2020-10-01 03:06:03 -07:00
a9ad06c107
Merge pull request #13446 from Putnam3145/dynamic-why-prob
...
Makes dynamic less probabilistic, keeping the desired threat level more aggressively
2020-10-01 03:05:15 -07:00
47aef0d574
Merge pull request #13443 from ItzGabby/gabby-wooden-floors
...
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00
8b36cf6f64
Merge pull request #13375 from timothyteakettle/emp-rework
...
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
dd43594e5b
Merge pull request #13417 from Citadel-Station-13/silicons-patch-1
...
fixes mecha trackers
2020-10-01 11:40:24 +02:00
c7875f2792
commit 3
2020-10-01 12:54:49 +08:00
d9ab31e199
commit 2
2020-10-01 11:30:01 +08:00
c4480afc09
Adds a bunch of RP clothes and ports the detvendor
2020-09-30 20:50:00 -05:00
ccb774b8f2
puddles
2020-09-30 02:15:34 +01:00
a41963fa13
Update space.dm
2020-09-29 13:03:11 -07:00
41d263da84
Update space.dm
2020-09-29 12:43:40 -07:00
8a01b949bf
Cleaned up SDGF and consistencised clones.
2020-09-29 03:47:09 -07:00
633da981e2
Update space.dm
2020-09-28 23:01:31 -07:00
silicons