silicons
|
5a9fc99aba
|
Merge pull request #14310 from Hatterhat/robo-surgery
[READY] robo-limb surgery tiers
|
2021-03-12 19:40:02 -07:00 |
|
Lin
|
9a16375e0b
|
Merge pull request #14403 from Hatterhat/brped-desc
fixes the BRPED desc that has been quirky! for years
|
2021-03-12 14:30:02 -06:00 |
|
Hatterhat
|
6a7d4e32d7
|
i'm gonna fight blackmajor over this
|
2021-03-10 13:55:00 -06:00 |
|
Sneakyrat6
|
d5b0251cb5
|
Merge branch 'master' into matContainer
|
2021-03-09 05:42:47 -05:00 |
|
Sneakyrat6
|
703567e591
|
other fixes
|
2021-03-07 04:09:36 -05:00 |
|
Hatterhat
|
80469a32f9
|
WHY WON'T YOU HIDE CORRECTLY
|
2021-03-01 22:33:21 -06:00 |
|
Hatterhat
|
1fc94c0441
|
uuuuuuuuuuuuh
|
2021-02-27 23:17:09 -06:00 |
|
Letter N
|
5304029dd9
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-23 11:01:42 +08:00 |
|
SandPoot
|
123de14009
|
upload files
|
2021-02-18 15:05:39 -03:00 |
|
SandPoot
|
f738023097
|
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
|
2021-02-18 15:04:46 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Letter N
|
de67720a0a
|
icons should exist
|
2021-02-14 11:39:56 +08:00 |
|
Letter N
|
45d6a5f87f
|
it compiles, UNTESTED YET
|
2021-02-13 21:41:59 +08:00 |
|
Letter N
|
a2419f760a
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-12 13:18:09 +08:00 |
|
Letter N
|
8a0c932d55
|
oops! All Refactors!
|
2021-02-12 11:07:58 +08:00 |
|
silicons
|
3f4aff09d1
|
Update code/modules/research/xenobiology/crossbreeding/_status_effects.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-02-05 00:59:19 -07:00 |
|
silicons
|
503d71ea45
|
Update _status_effects.dm
|
2021-01-31 18:03:36 -07:00 |
|
silicons
|
a1e92e55aa
|
Merge pull request #14102 from Hatterhat/somatobuff-50513
[READY] somatoray buff - mutation locks + revolution ray
|
2021-01-25 23:17:29 -07:00 |
|
Letter N
|
021b28a2b7
|
cleanup
shitcode - b - gone
|
2021-01-20 11:08:21 +08:00 |
|
Hatterhat
|
a8cb8b79c6
|
for one, dont forget the sprites, dumbass
|
2021-01-19 17:40:34 -06:00 |
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
DeltaFire
|
aa1cae9f33
|
Merge pull request #14054 from TheObserver-sys/AReturnToForm
Returns the Maintenance Shotgun to it's original recipe. Removes the Maintenance Rifle, and associated items.
|
2021-01-15 18:22:05 +01:00 |
|
The0bserver
|
1b469bdfda
|
The power of overwriting...
|
2021-01-14 01:03:48 -05:00 |
|
silicons
|
28849dd8e9
|
Merge pull request #14039 from Hatterhat/sticky-start
on the precipice of stickiness - sticky tape roundstart tech
|
2021-01-13 21:02:23 -07:00 |
|
silicons
|
ae290cf5f0
|
newlines
|
2021-01-13 16:56:36 -07:00 |
|
silicons
|
bcb2e16cef
|
Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
|
2021-01-13 16:53:01 -07:00 |
|
Hatterhat
|
b36a1142fe
|
on the precipice of stickiness
|
2021-01-12 16:58:20 -06:00 |
|
Hatterhat
|
cb40ad4764
|
atomization is cowardice actually
|
2021-01-12 16:08:17 -06:00 |
|
SiliconMain
|
bc64cedc2d
|
Update misc_nodes.dm
|
2021-01-12 14:42:35 -06:00 |
|
SiliconMain
|
a26590965e
|
Update misc_designs.dm
|
2021-01-12 14:41:10 -06:00 |
|
Lin
|
95101ac36a
|
Merge pull request #14013 from Citadel-Station-13/compressor
lets science actually print explosive compressors
|
2021-01-11 00:21:11 +00:00 |
|
silicons
|
fd77be9b89
|
Update _status_effects.dm
|
2021-01-09 16:44:56 -07:00 |
|
silicons
|
c36151b4cf
|
Update machine_designs_sci.dm
|
2021-01-09 15:35:26 -07:00 |
|
silicons
|
b0a94a6e1c
|
Update engineering_nodes.dm
|
2021-01-09 07:30:14 -07:00 |
|
silicons
|
34c5d99afb
|
Update machine_designs_sci.dm
|
2021-01-09 07:29:31 -07:00 |
|
shellspeed1
|
04d60c85d9
|
a
|
2021-01-09 03:06:48 -08:00 |
|
silicons
|
ccbfd4015e
|
Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon
Ports bluespace navigation gigabeacon from TG
|
2021-01-03 18:11:10 -07:00 |
|
silicons
|
2641332fb2
|
Merge pull request #13941 from Chiirno/ChemMixerHotfix
Portable Chem Mixer now added to the Biological Technology tech node.
|
2021-01-03 18:09:50 -07:00 |
|
DeltaFire
|
2ed866d855
|
boom
|
2021-01-01 07:22:10 +01:00 |
|
Chiirno
|
218cac1a49
|
OK, chem mixer has been added to a tech node now.
|
2020-12-31 22:19:51 -04:00 |
|
shellspeed1
|
45ce0a72a1
|
Ports bluespace navigation gigabeaconon
port of https://github.com/tgstation/tgstation/pull/44807
|
2020-12-31 01:49:38 -08:00 |
|
Lin
|
3ad777f8f7
|
Merge pull request #13755 from silicons/colormates
ports colormates from rp/vorestation
|
2020-12-20 18:14:48 +00:00 |
|
SandPoot
|
a0ae0c37fe
|
upload files
|
2020-12-16 11:39:50 -03:00 |
|
silicons
|
317f33b4e5
|
fixes
|
2020-12-11 05:14:23 -07:00 |
|
silicons
|
8f36a1d2ec
|
okay
|
2020-11-22 15:20:52 -07:00 |
|
silicons
|
18bdda1273
|
fix
|
2020-11-22 15:01:19 -07:00 |
|
silicons
|
13ebceb670
|
why did i do this
|
2020-11-22 14:56:02 -07:00 |
|
silicons
|
c7e60191df
|
whew
|
2020-11-22 14:44:05 -07:00 |
|
silicons
|
5ae410790b
|
locking
|
2020-11-22 14:40:57 -07:00 |
|
silicons
|
37e26833a6
|
wew
|
2020-11-22 14:16:14 -07:00 |
|