silicons
|
6a2ae34ebe
|
Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
|
2021-01-25 23:17:09 -07:00 |
|
silicons
|
b77cc68e8d
|
Merge pull request #14133 from Hatterhat/depcards-nobody-asked-for
department budget cards but not in lockers
|
2021-01-25 23:02:11 -07:00 |
|
silicons
|
de8d778f76
|
Merge pull request #14134 from Arturlang/Give_improvements
[READY]Give Improved
|
2021-01-25 23:02:03 -07:00 |
|
silicons
|
efecc1804b
|
Merge pull request #14114 from Hatterhat/fgs
itt: i dont test my code again - free golem ship GPSes start disabled
|
2021-01-25 22:59:09 -07:00 |
|
silicons
|
6094293b4b
|
Merge pull request #14105 from DeltaFire15/heretic-target-fix
Heretic sacrifice target logging + a fix
|
2021-01-25 22:58:54 -07:00 |
|
raspy-on-osu
|
622a3df378
|
Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor
|
2021-01-24 19:21:24 -05:00 |
|
Artur
|
91cd7378ca
|
Give Improved
|
2021-01-24 16:05:42 +02:00 |
|
Hatterhat
|
cbc19c7e91
|
depcards not in lockers
|
2021-01-23 19:37:39 -06:00 |
|
MrJWhit
|
3e157c3aa8
|
Update headset.dm
|
2021-01-22 19:18:28 -05:00 |
|
Hatterhat
|
95db018de8
|
itt: i dont test my code again
|
2021-01-20 18:34:57 -06:00 |
|
silicons
|
fa587e3d1a
|
Merge pull request #14100 from Hatterhat/sheath-exp
twinsheath additions
|
2021-01-20 15:20:45 -07:00 |
|
silicons
|
f7c6dbd8ba
|
Merge pull request #14110 from BlueWildrose/nicebobbertsonsyougotthere
Removes oversized genitalia analysis from medical scanners
|
2021-01-20 15:17:12 -07:00 |
|
Artur
|
41f4586f50
|
Forgot to undo some testing changes
|
2021-01-20 22:30:14 +02:00 |
|
Artur
|
4457d568dd
|
Tank memes finished
|
2021-01-20 20:25:36 +02:00 |
|
Artur
|
87c9201707
|
No gunning sadly
|
2021-01-20 19:51:11 +02:00 |
|
Artur
|
66979e2364
|
Merge branch 'master' into revenant_TK
|
2021-01-20 18:27:11 +02:00 |
|
Artur
|
16e0b85b44
|
More funshit
|
2021-01-20 18:23:28 +02:00 |
|
DeltaFire
|
e24eb14121
|
args
these are needed for the CI not to fail, even if unused in most cases.
|
2021-01-20 16:32:15 +01:00 |
|
Blue Wildrose
|
80ccc93fd7
|
Removes breast and penis analysis from medical scanners
|
2021-01-20 07:32:03 -07:00 |
|
Artur
|
3737c52df8
|
Funny actions
|
2021-01-20 15:23:34 +02:00 |
|
Letter N
|
02ca168df3
|
why are we building windows facing nothing but rock infront of it?
|
2021-01-20 11:37:44 +08:00 |
|
Letter N
|
021b28a2b7
|
cleanup
shitcode - b - gone
|
2021-01-20 11:08:21 +08:00 |
|
Letter N
|
c08765d0eb
|
let's not get ddosed
|
2021-01-20 10:23:30 +08:00 |
|
Hatterhat
|
fccf24ac17
|
sheef
|
2021-01-19 16:54:49 -06:00 |
|
silicons
|
dedb0cb62e
|
Merge remote-tracking branch 'citadel/master' into tgsync
|
2021-01-19 04:24:42 -07:00 |
|
silicons
|
f0a9a7a179
|
fix
|
2021-01-19 04:21:21 -07:00 |
|
Lin
|
5eafdd164f
|
Merge pull request #14069 from Citadel-Station-13/silicons-patch-18
moves say_emphasis from compose_message to lang_treat to prevent _underlines_ from colliding with command_headset spans having _ in it
|
2021-01-18 13:21:13 -06:00 |
|
Lin
|
73213b4bad
|
Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
|
2021-01-18 13:17:05 -06:00 |
|
silicons
|
2266a9e17b
|
Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
|
2021-01-17 20:42:19 -07:00 |
|
silicons
|
829e946755
|
Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
|
2021-01-17 20:40:09 -07:00 |
|
Letter N
|
0b088be4df
|
missing ,
|
2021-01-17 18:00:43 +08:00 |
|
Letter N
|
919b8c8d57
|
Update machine_circuitboards.dm
|
2021-01-17 17:54:06 +08:00 |
|
silicons
|
98bc547c5b
|
Update say.dm
|
2021-01-16 01:07:52 -07:00 |
|
DeltaFire
|
3e917653c7
|
Merge pull request #14044 from corin9090/beadies
Belt slot prayer beads
|
2021-01-15 18:50:14 +01:00 |
|
DeltaFire
|
d331dd4b1e
|
Merge pull request #14046 from Citadel-Station-13/silicons-patch-10
buffs and fixes BOOMERANG STUNBATONS
|
2021-01-15 18:30:32 +01:00 |
|
DeltaFire
|
de40e96180
|
Merge pull request #14047 from Citadel-Station-13/silicons-patch-11
boomerangs now properly turn ON your throw mode rather than turning it off when it already is
|
2021-01-15 18:30:16 +01: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 |
|
silicons
|
ea56565872
|
fix
|
2021-01-14 20:19:04 -07:00 |
|
Hatterhat
|
798b25846d
|
gauze parity
|
2021-01-14 20:53:55 -06:00 |
|
The0bserver
|
e01c57c832
|
Show me the opposite of funny!
|
2021-01-14 01:12:53 -05:00 |
|
The0bserver
|
1b469bdfda
|
The power of overwriting...
|
2021-01-14 01:03:48 -05:00 |
|
silicons
|
1df2257e61
|
Merge pull request #14052 from SiliconMain/baitbegone
Update engineering.dm
|
2021-01-13 22:43:01 -07:00 |
|
SiliconMain
|
cccb547a72
|
Update engineering.dm
|
2021-01-13 23:41:49 -06:00 |
|
silicons
|
8f7b483161
|
remove reverb
|
2021-01-13 21:37:30 -07:00 |
|
The0bserver
|
ffe401544c
|
First wave of fixing
|
2021-01-13 23:35:37 -05:00 |
|
The0bserver
|
55cd69746d
|
A change in tact, perhaps?
|
2021-01-13 23:08:05 -05:00 |
|
The0bserver
|
2b8b9086ec
|
Revert "Initial Commit:Goodbye rifle! You won't be missed!"
This reverts commit 1836d0106a.
|
2021-01-13 22:14:36 -05:00 |
|
The0bserver
|
1836d0106a
|
Initial Commit:Goodbye rifle! You won't be missed!
|
2021-01-13 21:42:08 -05:00 |
|
silicons
|
bcb2e16cef
|
Merge pull request #14035 from SiliconMain/baitbegone
Comments out hololocks
|
2021-01-13 16:53:01 -07:00 |
|
silicons
|
9ddb3dc5d9
|
fix
|
2021-01-13 16:22:43 -07:00 |
|