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
|
2e29f30fdf
|
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
|
2021-02-18 15:04:22 -03:00 |
|
SandPoot
|
cf2e70671a
|
upload files
|
2021-02-18 14:47:10 -03:00 |
|
Lin
|
3b9f1cb4ec
|
Merge pull request #14239 from Hatterhat/golem-gps-pass2
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
|
2021-02-17 17:29:03 -06:00 |
|
silicons
|
e009b9ef5f
|
Merge pull request #14186 from SmArtKar/trading_card_game
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
|
2021-02-17 01:30:13 -07:00 |
|
SmArtKar
|
e4afe49687
|
Adds card crafting!"
|
2021-02-16 19:38:48 +03:00 |
|
SandPoot
|
4e18044450
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui
|
2021-02-14 20:10:41 -03:00 |
|
Hatterhat
|
c5a9a8905a
|
actually makes golem gpses start off
|
2021-02-13 15:20:24 -06:00 |
|
silicons
|
76837ee0b6
|
Merge pull request #14225 from Hatterhat/dth-kit-pass2
[hello if someone could fight the maintainers to take a look that'd be great] fixes durathread armor kits
|
2021-02-12 18:54:36 -07:00 |
|
DeltaFire
|
1ea3aafa10
|
Merge pull request #14166 from Hatterhat/ebola-nerf
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
|
2021-02-12 05:06:48 +01:00 |
|
Hatterhat
|
7ec692ef60
|
this is good...isn't it?
|
2021-02-11 19:08:29 -06:00 |
|
SandPoot
|
a0c92f0646
|
upload files
|
2021-02-11 13:22:37 -03:00 |
|
Hatterhat
|
8103078ff1
|
second pass pt2
|
2021-02-11 00:29:25 -06:00 |
|
Hatterhat
|
3040eca4e0
|
holy shit what was i thinking god FUCK durathread
|
2021-02-11 00:20:49 -06:00 |
|
silicons
|
e8da810cd3
|
Merge pull request #14205 from keronshb/warpimplant-adjustment
Triples Warp Implant's cooldown
|
2021-02-10 02:08:57 -07:00 |
|
dzahlus
|
6dabe348fa
|
fixes oversights
fixes grenadelauncher.ogg being used where it shouldnt FOR GOOD NOW I SWEAR. Bokken sound fixed, mech weapons now use proper sound too
|
2021-02-08 14:43:33 +01:00 |
|
keronshb
|
38827122e9
|
Adjusts warp implant to 30 second delay
who thought this was a good idea
|
2021-02-07 23:50:42 -05:00 |
|
silicons
|
cf4a5f3388
|
Merge pull request #14189 from dzahlus/diversify-sound
Diversify weapon sound
|
2021-02-06 11:42:36 -07:00 |
|
SmArtKar
|
2135a391dc
|
More cards? More cards!
|
2021-02-04 19:03:03 +03:00 |
|
SmArtKar
|
2cd339f776
|
Adds Card Ops bundle
|
2021-02-04 18:57:00 +03:00 |
|
dzahlus
|
84207813b7
|
rework of present sounds
Reworks already present sounds in the game, specifically of the folder "weapons"
|
2021-02-02 23:28:53 +01:00 |
|
TyrianTyrell
|
4f5f0eec07
|
Update radio.dm
|
2021-01-31 14:19:04 -05:00 |
|
TyrianTyrell
|
cfa169293c
|
Update radio.dm
|
2021-01-31 14:17:53 -05:00 |
|
TyrianTyrell
|
318f34be78
|
Update headset.dm
|
2021-01-31 14:15:40 -05:00 |
|
Hatterhat
|
4525b1b64f
|
ooOOooOO today i wont test my code again
|
2021-01-29 20:19:58 -06:00 |
|
silicons
|
1974f2b41d
|
Merge pull request #14148 from zeroisthebiggay/whytho
gives the advanced extinguisher a sprite that doesn't look like total dogshit even by codersprite standards
|
2021-01-29 07:29:28 -07:00 |
|
zerothebigboy
|
e7d8021b81
|
a
|
2021-01-27 18:46:11 -05:00 |
|
silicons
|
0a5ad34fd6
|
Update pinpointer.dm
|
2021-01-26 07:26:59 -07:00 |
|
silicons
|
93ff29a579
|
Update pinpointer.dm
|
2021-01-26 00:00:39 -07:00 |
|
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 |
|
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
|
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 |
|
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
|
021b28a2b7
|
cleanup
shitcode - b - gone
|
2021-01-20 11:08:21 +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 |
|
Lin
|
73213b4bad
|
Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
|
2021-01-18 13:17:05 -06:00 |
|