kevinz000
d4e6fada75
Update mirage_border.dm ( #12092 )
2020-05-03 03:50:38 +02:00
Lin
f659c036ef
Merge pull request #12036 from kevinz000/electrochromatic_windows
...
Electrochromatic (dim-on-demand) windows
2020-05-02 19:13:29 +00:00
Ghommie
42d7d57ad6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit698
2020-05-02 19:17:48 +02:00
kevinz000
269db0c7d6
Identification components + chameleon clothing from uplink is now obfuscated ( #12045 )
...
* fine we'll use components
* syndie kits
* Whew
* examine
* flags
* whew
* compile
* fix
* fix
* ok
* ok
* ok
* done
2020-05-01 18:39:45 +02:00
kevinz000
1e42f3a3b7
Merge pull request #12023 from Ghommie/Ghommie-cit712
...
Fixing riding layers for human/cyborgs.
2020-04-29 12:03:29 -07:00
TrilbySpaceClone
1191268430
kevs request
2020-04-27 07:34:23 -04:00
kevinz000
28da033111
fine
2020-04-26 17:37:27 -07:00
kevinz000
bf7962d8f9
wow lotsa effort huh
2020-04-26 03:36:09 -07:00
kevinz000
af3651172c
wow lotsa effort huh
2020-04-26 03:29:31 -07:00
kevinz000
36512938a0
Merge pull request #11991 from DeltaFire15/nanite-repli-protocols
...
Adds nanite replication protocols to our techweb
2020-04-25 16:54:32 -07:00
kevinz000
4689e2aeb6
Merge pull request #11980 from Ghommie/Ghommie-cit700
...
Movespeed modifiers refactor port.
2020-04-25 16:51:14 -07:00
Ghommie
d2d5fda0e2
Fixing riding layers for human/cyborgs.
2020-04-25 16:54:17 +02:00
Ghom
7b877eb9e0
Merge pull request #11832 from Seris02/storagewhitelist
...
adds extra functionality to storage whitelists
2020-04-25 02:50:56 +02:00
Ghom
f01cb896e5
Apply suggestions from code review
2020-04-25 02:43:56 +02:00
DeltaFire
1a6f5eb131
If it compiles it works
...
Kidding, tested on local and it runs fine.
Adds nanite protocols to the techweb, without BEPIS, aswell as adding one more protocol onto the ones ported from /tg
2020-04-23 15:15:26 +02:00
kevinz000
529a8e52c7
Merge pull request #11960 from Trilbyspaceclone/patch-352
...
Theirs a snake in my boot...
2020-04-22 18:42:46 -07:00
Ghommie
42201343a9
Backward 512 compatibility removal.
2020-04-23 00:59:23 +02:00
Lin
7f271157c3
Merge pull request #11929 from Ghommie/Ghommie-cit692
...
Shielded Component
2020-04-22 20:33:12 +00:00
Ghommie
63f5e101a2
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit700
2020-04-22 22:30:10 +02:00
Ghom
63362f74c9
Merge pull request #11912 from Seris02/betteruipref
...
toggle for tetris bags
2020-04-22 22:26:40 +02:00
Ghommie
63870cc9d1
Movespeed modifiers refactor port.
2020-04-22 22:01:39 +02:00
Ghommie
e9bf432a0d
Scavenging element.
2020-04-22 03:30:40 +02:00
Ghommie
824904844c
Componentized for sanity.
2020-04-21 19:51:44 +02:00
Ghom
5a6a205b9d
Merge pull request #11868 from Arturlang/tackling_and_lunge
...
Ports TG Tackling and uses it to rework bloodsucker lunge
2020-04-21 15:50:44 +02:00
Trilbyspaceclone
6dd89ec1e0
Update pockets.dm
2020-04-20 21:50:25 -04:00
Ghom
79eb0f5838
Merge pull request #11956 from Trilbyspaceclone/crafting_menu
...
Fixes Crafting menu
2020-04-21 01:25:46 +02:00
TrilbySpaceClone
c3fc133282
*crys*
2020-04-20 18:28:57 -04:00
TrilbySpaceClone
58cb5e391e
*scream*
2020-04-20 18:22:13 -04:00
TrilbySpaceClone
747e27007f
***ahhhh***
2020-04-20 17:26:22 -04:00
TrilbySpaceClone
4d55f169d5
oh god oh fuck
2020-04-20 17:05:03 -04:00
Timothy Teakettle
c5b8c45bf0
Merge branch 'master' into food-quality
2020-04-20 19:53:39 +01:00
kevinz000
85fcdbf673
Merge pull request #11916 from Trilbyspaceclone/crafting_menu
...
Cleans up misc tab in the crafting menu
2020-04-20 11:37:13 -07:00
kevinz000
cbc9f325f4
Merge pull request #11921 from necromanceranne/minor_fix_scarp_stammod
...
Sleeping Carp has a Stamina Mod again, gets Taser resistance, various fixes (no more universal pugilism)
2020-04-20 11:34:06 -07:00
kevinz000
792af56b67
Update riding.dm
2020-04-19 00:48:51 -07:00
Ghom
f714403d6e
Merge pull request #11895 from Seris02/piggybackfix
...
fixes piggyback merging
2020-04-19 04:56:04 +02:00
kevinz000
b65ad491b4
Merge pull request #11902 from Citadel-Station-13/revert-11611-patch-2
...
Revert "Makes so turning in place updates riders when riding someone's back"
2020-04-18 19:32:34 -07:00
necromanceranne
cb39ba3491
Replaces the Scarp stamina mod, adds tased resistance which I forgot to do for almost a month even though I kind of made it with scarp in mind, fixes the capitalization of armwraps
2020-04-19 04:25:41 +10:00
TrilbySpaceClone
42bb01057f
now with working code!
2020-04-18 10:09:15 -04:00
TrilbySpaceClone
8ca7bb7535
Right...
2020-04-18 09:46:56 -04:00
Ghom
bd03d2a362
Merge pull request #11908 from Putnam3145/fix-tactical-destroy
...
Makes tactical component destroy() work properly.
2020-04-18 13:32:49 +02:00
Ghom
9b981d0749
Merge pull request #11888 from Citadel-Station-13/kevinz000-patch-9
...
fixes closer extending too many rows up
2020-04-18 13:28:34 +02:00
Artur
edb7b1d61c
Fixes catstuffs
2020-04-18 13:52:27 +03:00
Artur
85c5548d1a
Ports https://github.com/tgstation/tgstation/pull/50521/
2020-04-18 13:49:06 +03:00
Seris02
cc82f08ebc
weh
2020-04-18 18:28:35 +08:00
Putnam
d361a8d6ae
Makes tactical destroy() work properly.
2020-04-17 22:33:11 -07:00
Ghom
2676d663d6
Revert "Makes so turning in place updates riders when riding someone's back"
2020-04-18 03:09:49 +02:00
Timothy Teakettle
cd25a7c145
Merge branch 'master' into food-quality
2020-04-17 15:03:44 +01:00
Artur
eafc69aa65
Reviewer suggestion, reduces paralyze
...
And ports that commit that ghommie said
2020-04-17 16:22:15 +03:00
kevinz000
3c4c67b6c5
Merge pull request #11869 from necromanceranne/pawnch_updaties
...
Pawnch Update 2.5: I swear this will be the last one for a while. + some slight fixes
2020-04-17 05:43:49 -07:00
Seris02
e30bd1f8ea
FIXES IT FINALLY OHHHH MY FUCKING GOD WHY IT WAS SO SIMPLE BUT SO HIDDEN FUCK
2020-04-17 17:17:50 +08:00