silicons
|
bf27de1aec
|
Merge pull request #13292 from Putnam3145/fix-dynamic-again
Rolling dynamic tweaks 'til it works
|
2020-08-29 21:41:06 -07:00 |
|
silicons
|
1ed712d69d
|
Merge pull request #13302 from necromanceranne/mecha_backstab_fix_port
ports #52214 from /tg/: fix for mecha backstabbing
|
2020-08-29 21:40:13 -07:00 |
|
silicons
|
9250a6d71d
|
Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
|
2020-08-29 21:34:57 -07:00 |
|
silicons
|
16fec8831a
|
Merge pull request #13230 from Detective-Google/reskin-obj
reskin_obj is now a radial
|
2020-08-29 21:33:28 -07:00 |
|
silicons
|
413ccdba96
|
Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
|
2020-08-29 21:32:58 -07:00 |
|
silicons
|
4a3b6054d3
|
Merge pull request #13266 from Ghommie/Ghommie-cit836
Fixing some mistakes with the priority overlays removal PR.
|
2020-08-29 21:22:44 -07:00 |
|
silicons
|
8cc84152d8
|
Merge pull request #13267 from Arturlang/op_slimes
Lets slime damage structures
|
2020-08-29 21:22:27 -07:00 |
|
Putnam
|
669bab841c
|
Made cost being more than threat delta more punished.
|
2020-08-29 20:44:45 -07:00 |
|
Putnam
|
19b856aebf
|
Removed story's curve.
|
2020-08-29 20:23:11 -07:00 |
|
necromanceranne
|
a0adc984cd
|
ports #52214 from /tg/
|
2020-08-30 12:19:38 +10:00 |
|
Putnam
|
d8d67d3d3e
|
And fixed their antag flag, too
|
2020-08-29 16:51:57 -07:00 |
|
Putnam
|
64e379c7ed
|
Added property weights to latejoin heretics, too
|
2020-08-29 16:51:38 -07:00 |
|
Putnam
|
9a4c76e787
|
Added property weights to heretic, too.
|
2020-08-29 16:47:07 -07:00 |
|
Putnam
|
6725ced453
|
Makes heretics actually able to be edited in the config.
|
2020-08-29 16:45:16 -07:00 |
|
Putnam
|
126ebf1f5e
|
Update dynamic_storytellers.dm
|
2020-08-29 01:50:22 -07:00 |
|
Putnam
|
cda93af643
|
Fixes dynamic... again.
|
2020-08-29 01:41:42 -07:00 |
|
Letter N
|
fe17bee28e
|
reverts thing kev said about
|
2020-08-29 14:36:41 +08:00 |
|
Letter N
|
ae482c1bb8
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-29 14:09:56 +08:00 |
|
Letter N
|
116145872f
|
commit thing, need to see changies but gitlens is denying me
|
2020-08-29 14:00:46 +08:00 |
|
raspy-on-osu
|
ca34a50726
|
Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295
|
2020-08-27 23:39:43 -04:00 |
|
Chiirno
|
2df4bedb06
|
All the errors deleted away
|
2020-08-27 14:44:19 -03:00 |
|
Chiirno
|
fdc2cea077
|
added chem dispenser, time for errors
|
2020-08-27 14:27:35 -03:00 |
|
silicons
|
664b2490c3
|
Merge pull request #13235 from timothyteakettle/bokken-update
buffs bokkens stamina damage by 2
|
2020-08-27 10:07:31 -07:00 |
|
silicons
|
9440a92c09
|
Merge pull request #13258 from shellspeed1/iv-drips
Ports drip feeding mode for iv drips from tg.
|
2020-08-27 10:02:43 -07:00 |
|
Artur
|
6c8b256e48
|
dont griff please
|
2020-08-26 20:23:19 +03:00 |
|
Artur
|
aaa8046dd2
|
Lets slime damage structures
|
2020-08-26 19:32:17 +03:00 |
|
Ghommie
|
2811f744e3
|
Fixing some mistakes with the priority overlays removal PR.
|
2020-08-26 14:00:35 +02:00 |
|
silicons
|
8699ce2174
|
fixes a bunch of broken clickdelays (#13218)
* fixes
* fix
|
2020-08-25 20:58:20 +02:00 |
|
shellspeed1
|
de7ecefad2
|
minor description change
|
2020-08-24 15:07:40 -07:00 |
|
shellspeed1
|
142dee3645
|
Update iv_drip.dm
|
2020-08-24 12:47:56 -07:00 |
|
Timothy Teakettle
|
cdb3647c56
|
thank
|
2020-08-24 15:38:49 +01:00 |
|
silicons
|
f86daefa4e
|
Merge pull request #13240 from timothyteakettle/ipcs-spark-when-blush
ipcs make fake electrical sparks when they blush or cry
|
2020-08-23 17:36:23 -07:00 |
|
silicons
|
82d8b7266f
|
Merge pull request #13238 from Hatterhat/insidious-tackle
insidious combat gloves but they can tackle now
|
2020-08-23 17:36:03 -07:00 |
|
silicons
|
2fa023346a
|
Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
|
2020-08-23 05:08:50 -07:00 |
|
timothyteakettle
|
b68baf2f25
|
this is funny
|
2020-08-23 01:44:33 +01:00 |
|
silicons
|
188bb13272
|
Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
|
2020-08-22 15:22:19 -07:00 |
|
silicons
|
7737e76b32
|
Merge pull request #13224 from Ghommie/Ghommie-cit835
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-22 15:19:07 -07:00 |
|
Hatterhat
|
8645a2954f
|
tackle hando
|
2020-08-22 16:13:41 -05:00 |
|
Letter N
|
6ba29acd4e
|
uses some cit procs. and how the fuck did i forget to componentualize this
|
2020-08-22 16:08:05 +08:00 |
|
Letter N
|
afe32406c0
|
Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
|
2020-08-22 13:40:36 +08:00 |
|
timothyteakettle
|
3cf81dcc6c
|
this is better
|
2020-08-22 01:56:56 +01:00 |
|
timothyteakettle
|
703a4ec262
|
weaker than fists
|
2020-08-22 01:47:27 +01:00 |
|
Detective Google
|
12e4c4c456
|
makes always_reskinnable work again
|
2020-08-21 15:03:51 -05:00 |
|
Detective Google
|
0fbd27fcfb
|
reskin_obj is now a radial
|
2020-08-21 14:57:11 -05:00 |
|
Letter N
|
f04918bdca
|
working code?
|
2020-08-21 15:09:49 +08:00 |
|
zerothebigboy
|
5d611155f1
|
a
|
2020-08-21 02:15:30 -04:00 |
|
zerothebigboy
|
5741db4a13
|
Merge branch 'thefunnytemporalkatanas' of https://github.com/zeroisthebiggay/Citadel-Station-13 into thefunnytemporalkatanas
# Conflicts:
# code/game/objects/items/weaponry.dm
|
2020-08-21 02:13:44 -04:00 |
|
zerothebigboy
|
a9abdeb044
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into thefunnytemporalkatanas
|
2020-08-21 02:10:03 -04:00 |
|
zerothebigboy
|
421e32f3f9
|
a final touch up
|
2020-08-21 02:06:36 -04:00 |
|
zerothebigboy
|
cca7e66457
|
a slight blink flavor
|
2020-08-21 01:54:09 -04:00 |
|