Hatterhat
09d91643ef
tg 56348
2021-01-22 18:39:46 -06:00
MrJWhit
a78b6ae958
Update transform_procs.dm
2021-01-22 19:35:17 -05:00
MrJWhit
8603a9fc77
Update ai.dm
2021-01-22 19:26:42 -05:00
MrJWhit
01d6d40d8e
Port'n
2021-01-22 19:04:37 -05:00
MrJWhit
399d04654a
Update alien.dm
2021-01-22 18:57:31 -05:00
MrJWhit
d9f2cccd84
Hehoo maybe I should actually see what happens when I compile
2021-01-22 13:33:18 -05:00
MrJWhit
5fe6772c58
Update microwave.dm
2021-01-22 13:23:10 -05:00
Dan-Neposh
fb75c6a949
adds in ending sequence for Ratvar spawning, + various other changes
...
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
2021-01-22 00:04:04 -05:00
Dan-Neposh
48d8ffc9a7
reverts every change slowing down developement of this PR
2021-01-21 23:42:23 -05:00
DeltaFire
920be8cffc
stuffs
2021-01-22 01:43:35 +01:00
Timothy Teakettle
ca9292f6fd
Update overmind.dm
2021-01-21 22:45:46 +00:00
Timothy Teakettle
897f8a744f
Update overmind.dm
2021-01-21 22:39:38 +00:00
Timothy Teakettle
8569c40ce5
Update adminpm.dm
2021-01-21 22:23:48 +00:00
Timothy Teakettle
401e6a7690
test
2021-01-21 20:17:25 +00:00
silicons
f2853ab414
Merge pull request #14103 from Arturlang/give_hotkey
...
[READY]Give hotkey, but citadel
2021-01-21 01:41:29 -07:00
silicons
34473c2ac7
fix
2021-01-20 16:55:19 -07:00
silicons
996ad0634d
fix
2021-01-20 16:16:06 -07:00
silicons
20f06cae0f
fix
2021-01-20 16:07:42 -07:00
silicons
235ca8809a
uh
2021-01-20 16:04:52 -07:00
silicons
e06f0bbc72
fixes
2021-01-20 16:01:09 -07:00
silicons
72716068ba
Merge pull request #14101 from Hatterhat/more-gauze-shit
...
some other gauze parity dogshit
2021-01-20 15:26:41 -07:00
silicons
8cb8ddef42
Merge pull request #13969 from Arturlang/blood_bag_tweaks
...
Tweaks blood bag consumption
2021-01-20 15:26:12 -07:00
silicons
83625305a2
Update uplink_clothing.dm
2021-01-20 15:24:09 -07:00
silicons
66874fe252
Merge pull request #14083 from shellspeed1/alternative-xeno-hive
...
Removes the queen, and increases xeno variety in lavaland xenomorph ruin.
2021-01-20 15:22:06 -07:00
silicons
2acdee8d01
Merge pull request #14076 from Hatterhat/cotton-stack-pull
...
pulling cotton (or durathread) while standing on a pile of cotton (or durathread) picks all of them
2021-01-20 15:21:44 -07:00
silicons
718cb3f501
Merge pull request #14092 from BlueWildrose/Timidwomen
...
Adds Timid wo/man costumes
2021-01-20 15:21:06 -07:00
silicons
fa587e3d1a
Merge pull request #14100 from Hatterhat/sheath-exp
...
twinsheath additions
2021-01-20 15:20:45 -07:00
silicons
288bbcd334
Merge pull request #14107 from shellspeed1/Brings-back-mining-point-card-for-borgs
...
Mining borgs get a point ID again.
2021-01-20 15:17:47 -07:00
silicons
5afe3bbb6f
Merge remote-tracking branch 'citadel/master' into ex_act_3
2021-01-20 15:15:10 -07:00
silicons
9f50ea66c8
Merge pull request #14104 from LetterN/semi-sync
...
[s] semi sync- we forgot the anti ddos thing
2021-01-20 15:14:37 -07:00
silicons
f6eca7afad
hugboxy shit
2021-01-20 15:06:53 -07:00
Lin
d262f366e7
Merge pull request #14097 from Citadel-Station-13/silicons-patch-28
...
i'm not sure why cargo's bird crate has every bird spawn with a headset but let's not have that
2021-01-20 15:20:50 -06:00
Artur
41f4586f50
Forgot to undo some testing changes
2021-01-20 22:30:14 +02:00
Artur
87c9201707
No gunning sadly
2021-01-20 19:51:11 +02:00
Putnam3145
2debe930fc
Merge pull request #14094 from kittycat2002/master
...
Gives /datum/reagent/consumable/ethanol/species_drink a name
2021-01-20 08:45:52 -08: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
Artur
3737c52df8
Funny actions
2021-01-20 15:23:34 +02:00
Letter N
125cd17cee
Merge remote-tracking branch 'origin/master' into rustsql
2021-01-20 15:40:41 +08:00
shellspeed1
81e37b6e33
Update robot_modules.dm
2021-01-19 21:40:47 -08:00
DeltaFire
721f9c6a7c
Merge remote-tracking branch 'upstream/master' into heretic-target-fix
2021-01-20 06:32:37 +01:00
silicons
ae5cb78424
Update toggles.dm
2021-01-19 22:27:13 -07:00
DeltaFire
7136f5cffb
boop
2021-01-20 06:09:20 +01:00
DeltaFire
4578f30001
brrt
2021-01-20 05:54:38 +01:00
Letter N
a68957dcc4
wow thanks tabnine 😂
2021-01-20 12:02:20 +08:00
Letter N
6547028272
what the fuck??
2021-01-20 11:56:44 +08:00
Letter N
9fa6958a99
OH FUCK
2021-01-20 11:49:53 +08:00
Letter N
021b28a2b7
cleanup
...
shitcode - b - gone
2021-01-20 11:08:21 +08:00
Artur
745c825205
Give hotkey, but citadel
2021-01-20 04:21:57 +02:00
Arturlang
cc4c3533b7
Apply suggestions from code review
...
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-01-20 02:25:22 +02:00
