 Ghommie
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02:00 |
|
|
silicons
|
9a4f9aef6e
|
Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam
pyro anomaly spam salt pr (offer_control now supports ignore_category)
|
2020-08-31 21:21:09 -07:00 |
|
|
silicons
|
db28a50953
|
Merge pull request #13310 from Putnam3145/fix-fusion-display
Makes fusion analyze not assume we're still on fusion v5
|
2020-08-31 21:20:15 -07:00 |
|
|
Putnam
|
6028c66ceb
|
Fixed the combat log issue
|
2020-08-30 08:26:29 -07:00 |
|
|
Putnam
|
4cf040a11a
|
Makes plastitanium rapier not silently poison for pacifists.
|
2020-08-30 06:25:00 -07:00 |
|
|
Putnam
|
9da959795c
|
Made the text make sense, again.
|
2020-08-30 05:42:21 -07:00 |
|
|
Putnam
|
15b5b77494
|
Replaced all the references of fusionpower to instability in results.
|
2020-08-30 03:06:36 -07:00 |
|
|
Putnam
|
5ba883bfe5
|
Fixes fusion power text to make sense.
|
2020-08-30 02:53:46 -07:00 |
|
|
silicons
|
69f6927275
|
Update broom.dm (#13058)
|
2020-08-30 09:52:54 +02:00 |
|
|
raspy-on-osu
|
c90c46a2d1
|
mob_spawners
|
2020-08-30 01:50:55 -04: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
|
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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
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
|
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
|
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 |
|
|
zeroisthebiggay
|
a183fb3165
|
Update weaponry.dm
thats an extra space
|
2020-08-21 01:45:23 -04:00 |
|
|
zeroisthebiggay
|
7f036428bd
|
Update weaponry.dm
thats an extra space
|
2020-08-21 01:40:19 -04:00 |
|
|
zerothebigboy
|
b960f4055d
|
a
|
2020-08-21 01:31:30 -04:00 |
|
|
silicons
|
120bcfc00c
|
Merge pull request #13178 from lolman360/plumb
[READY] ports plumbing (no more waiting for tgui4)
|
2020-08-20 21:32:26 -07:00 |
|
|
Ghommie
|
fde859bca0
|
Removing priority overlays, update_icon() splitup for guns.
|
2020-08-20 18:33:23 +02:00 |
|
|
Letter N
|
2dd3d71b19
|
config©paste chang.
|
2020-08-20 16:36:24 +08:00 |
|
|
Letter N
|
3b7bca28b3
|
Functional* code
|
2020-08-20 13:50:33 +08:00 |
|
|
timothyteakettle
|
46a464d3b8
|
no it also cant be sentient
|
2020-08-19 02:26:08 +01:00 |
|