silicons
|
7b50b22c7b
|
Merge pull request #13244 from lolman360/AnPrimAssistants
Blacksmithing 2: Anarcho-Primitivist Assistants (travis don't fail on me now)
|
2020-09-05 02:20:11 -07:00 |
|
silicons
|
6527e2e9ea
|
Merge pull request #13348 from raspy-on-osu/thermomachine-why
Thermomachine boards (Freezer/Heater) now tell you how to change their pipe layer
|
2020-09-05 02:16:18 -07:00 |
|
raspy-on-osu
|
4c8983f006
|
init
|
2020-09-04 22:13:56 -04:00 |
|
silicons
|
14ebeddea2
|
Merge pull request #13304 from GrayRachnid/revert-8235-defib-notouch
Revert "Buffs defib users by making them stop pulling automatically"
|
2020-09-04 12:56:13 -07:00 |
|
Ghommie
|
dc9b024fae
|
Blemishes begone.
|
2020-09-02 19:16:16 +02:00 |
|
GrayRachnid
|
a7a8bb7992
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into revert-8235-defib-notouch
|
2020-09-01 23:57:06 -04:00 |
|
lolman360
|
5697ab2ff4
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-09-01 16:57:02 +10: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 |
|
lolman360
|
05bd0579ca
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-09-01 11:23:57 +10: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 |
|
silicons
|
9250a6d71d
|
Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
|
2020-08-29 21:34:57 -07:00 |
|
GrayRachnid
|
1234b51e82
|
Revert "Buffs defib users by making them stop pulling automatically"
|
2020-08-30 00:24:31 -04: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 |
|
lolman360
|
55c8250324
|
AAAAAAAAAAAAAAAAA
|
2020-08-28 12:44:59 +10: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 |
|
lolman360
|
0ff85deddf
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-25 01:25:34 +10:00 |
|
Timothy Teakettle
|
cdb3647c56
|
thank
|
2020-08-24 15:38:49 +01: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 |
|
lolman360
|
f2a7c2599d
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-24 09:36:36 +10:00 |
|
lolman360
|
daeaf81ab6
|
e
|
2020-08-24 01:25:26 +10:00 |
|
lolman360
|
0f9f1e240c
|
w
|
2020-08-24 00:51:13 +10:00 |
|
lolman360
|
4b2b4afc64
|
e
|
2020-08-24 00:49:31 +10:00 |
|
lolman360
|
6463d0b785
|
Merge branch 'AnPrimAssistants' of https://github.com/lolman360/Citadel-Station-13 into AnPrimAssistants
|
2020-08-24 00:27:29 +10:00 |
|
lolman360
|
b74c5ba22d
|
ee
|
2020-08-24 00:27:22 +10:00 |
|
lolman360
|
460c92de74
|
3
|
2020-08-24 00:20:04 +10:00 |
|
lolman360
|
05250939c6
|
e
|
2020-08-23 23:58:04 +10:00 |
|
silicons
|
2fa023346a
|
Merge pull request #13204 from timothyteakettle/donator-items
adds three t1 donator items
|
2020-08-23 05:08:50 -07:00 |
|
lolman360
|
bc14155632
|
Merge remote-tracking branch 'upstream/master' into AnPrimAssistants
|
2020-08-23 17:01:45 +10:00 |
|
lolman360
|
1deafc7103
|
its asking me to commit hold on
|
2020-08-23 17:01:32 +10:00 |
|
lolman360
|
2a3ada511e
|
It's all codersprites?
Always has been.
|
2020-08-23 16:51:55 +10: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 |
|
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 |
|