silicons
|
cb52be5dd9
|
fixes linter warnings (#14778)
* woo
* woo
|
2021-05-31 10:19:20 -05:00 |
|
WanderingFox95
|
499111edf8
|
Efink
|
2021-05-17 12:33:39 +02:00 |
|
silicons
|
e3755fba92
|
Merge pull request #14639 from necromanceranne/cyberorgan_stuff_ye
Ports a significant amount of the tg cybernetic organ code + more
|
2021-04-28 21:20:57 -06:00 |
|
The0bserver
|
c7b231637e
|
boxes of ammo, also fire not weapon is bullet
|
2021-04-24 00:53:57 -04:00 |
|
necromanceranne
|
0f04bbb23b
|
Ports a significant amount of the tg cybernetic organ code while making some additional changes to their power
|
2021-04-22 13:06:31 +10:00 |
|
Putnam
|
6ae984971c
|
Ported bluespace pipes from yogs
|
2021-03-30 23:25:36 -07:00 |
|
silicons
|
b6b62e84bc
|
Update machine_designs_service.dm
|
2021-03-28 12:47:22 -07:00 |
|
silicons
|
bf382f490c
|
Merge pull request #14518 from necromanceranne/shield_explodies_fix
Shields: Changes, additional flags, bug fixes, sprites
|
2021-03-27 01:31:55 -06:00 |
|
necromanceranne
|
79de55c58c
|
First part of the largescale shield cleanup, including ensuring shields respect their various counters and strengths appropriately.
|
2021-03-25 09:07:52 +11:00 |
|
DeltaFire
|
afd8af60e3
|
Merge pull request #14430 from YakumoChen/genetics
Adjusts Thermals in Genetics; Moves X-ray implant to illegal tech.
|
2021-03-23 22:35:54 +01:00 |
|
Lin
|
51b955d47e
|
Merge pull request #14460 from Hatterhat/exp-sup-con
moves the express supply console and upgrade disk to appropriate tabs
|
2021-03-19 19:18:19 -05:00 |
|
silicons
|
8c97297a47
|
Merge pull request #14444 from DeltaFire15/jar-removal
Locks Bluespace Jars to be admin-only
|
2021-03-18 06:41:38 -06:00 |
|
Hatterhat
|
5fa06109ac
|
lemme get uh
|
2021-03-17 15:49:57 -05:00 |
|
DeltaFire
|
45c3f2b222
|
Merge pull request #14406 from Hatterhat/hypoprints
a PR about empty hypospray kits, vial printing, along with a thing about quantum electromag
|
2021-03-17 17:01:47 +01:00 |
|
Hatterhat
|
97e0e01265
|
ok
|
2021-03-17 03:25:06 -05:00 |
|
DeltaFire
|
f99c17012c
|
removes jars from techweb
|
2021-03-15 22:26:05 +01:00 |
|
YakumoChen
|
cb96d72cbd
|
Update medical_nodes.dm
|
2021-03-13 02:54:19 +00:00 |
|
YakumoChen
|
72939a9b97
|
Update syndicate_nodes.dm
|
2021-03-13 02:53:48 +00:00 |
|
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
|
d3a6c9b20a
|
removes bshv
|
2021-03-11 23:38:49 -06:00 |
|
Hatterhat
|
8bebe5a649
|
adds hypokit
|
2021-03-10 16:17:24 -06:00 |
|
Hatterhat
|
d473b271cb
|
uh oh! it's another stupid fucking hatter pr!
|
2021-03-10 15:06:39 -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 |
|