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 |
|
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 |
|
Putnam
|
81dc6c7ee5
|
Ports reftracking from TG.
|
2020-08-18 20:41:43 -07:00 |
|
silicons
|
04a0c2be6c
|
Merge pull request #13194 from DeltaFire15/slab-wiki
Updates the clockcult help link to link to our wiki.
|
2020-08-18 18:53:21 -07:00 |
|
timothyteakettle
|
46a464d3b8
|
no it also cant be sentient
|
2020-08-19 02:26:08 +01:00 |
|
timothyteakettle
|
097851cbc4
|
better name
|
2020-08-19 02:11:08 +01:00 |
|
timothyteakettle
|
98baa09005
|
the aforementioned pet changes
|
2020-08-19 01:47:11 +01:00 |
|
Timothy Teakettle
|
19dce2263d
|
that too
|
2020-08-18 17:49:01 +01:00 |
|
Timothy Teakettle
|
945ac02152
|
small error
|
2020-08-18 17:48:10 +01:00 |
|
Timothy Teakettle
|
6392367df4
|
donator items
|
2020-08-18 17:28:09 +01:00 |
|
lolman360
|
e00c383b1a
|
Update belt.dm
|
2020-08-18 20:19:54 +10:00 |
|
lolman360
|
4e23559065
|
Update sheet_types.dm
|
2020-08-18 18:15:24 +10:00 |
|
lolman360
|
d8e286d7be
|
ee
|
2020-08-18 16:17:00 +10:00 |
|
Detective Google
|
b13048f636
|
makes glass floors actually deconstructable
|
2020-08-17 12:15:09 -05:00 |
|
DeltaFire
|
31f1e04654
|
updates the helpertext in general
Recollection doesn't actually offer any help anymore and just redirects you to the wiki anyways.
|
2020-08-17 17:03:53 +02:00 |
|
DeltaFire
|
c74803dd1a
|
updates the wiki page link
|
2020-08-17 16:53:49 +02:00 |
|
silicons
|
f611945b34
|
Merge pull request #13180 from Detective-Google/glass-floors
ports multiz glass floors (tgstation/tgstation#50831)
|
2020-08-17 03:14:15 -07:00 |
|
Putnam3145
|
23b4ba3714
|
Merge pull request #13063 from silicons/supermatter
Ports /tg/ supermatter - no more infinite stunlock death on charge inertia delaminations
|
2020-08-17 03:13:14 -07:00 |
|
silicons
|
8dedcbcf76
|
Merge branch '13113'
|
2020-08-16 18:53:35 -07:00 |
|
silicons
|
2095e2705f
|
Merge branch '13169'
|
2020-08-16 18:52:13 -07:00 |
|
silicons
|
83e72b4f96
|
Merge branch '13164'
|
2020-08-16 18:51:36 -07:00 |
|
silicons
|
a900c07846
|
Merge branch '13163'
|
2020-08-16 18:51:24 -07:00 |
|
silicons
|
44e2327280
|
Merge branch '13143'
|
2020-08-16 18:47:48 -07:00 |
|
silicons
|
397cdb6c03
|
Merge branch '13129'
|
2020-08-16 18:45:35 -07:00 |
|
silicons
|
9c63a09907
|
Merge branch 'pr-13087'
|
2020-08-16 18:40:07 -07:00 |
|
silicons
|
01dd2f389b
|
Merge branch 'pr-13067'
|
2020-08-16 18:38:13 -07:00 |
|
Lin
|
d287f44d9a
|
Merge pull request #13045 from silicons/coggers
ports bronze (fake clockwork) airlocks and windows
|
2020-08-16 20:20:03 -05:00 |
|
Detective Google
|
44e024a62f
|
specification
|
2020-08-16 18:44:05 -05:00 |
|
Detective Google
|
0e1586f24d
|
adds a construction path to glass floors
|
2020-08-16 18:21:29 -05:00 |
|
Hatterhat
|
bc0ca30647
|
there is no cooldown, press G
|
2020-08-16 15:45:11 -05:00 |
|
Putnam
|
f54d272b11
|
Yet more dynamic tweaks.
|
2020-08-15 23:38:21 -07:00 |
|
Detective-Google
|
ff6ef5d476
|
local idiot learns to spell
|
2020-08-16 00:22:21 -05:00 |
|
Detective Google
|
016fd2ac3c
|
woo yeah yeah woo
|
2020-08-15 23:55:52 -05:00 |
|
Navier
|
fc70d3dde2
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into DRAKEBORG
|
2020-08-15 23:13:41 -04:00 |
|
silicons
|
b2c65e34fc
|
Merge pull request #13157 from kiwedespars/nullrod-nerf
chaplain nullrod nerf
|
2020-08-15 08:00:43 -07:00 |
|