Pin-alternative
64cbd81e9c
Merge remote-tracking branch 'upstream/master' into cursed
2022-06-07 17:10:33 +10:00
Timothy Teakettle
c025a4f36e
commit names arent important right?
2022-06-02 20:40:21 +01:00
Timothy Teakettle
dad0aa72f0
OH BOY
2022-06-02 19:18:11 +01:00
BongaTheProto
53fa6873d1
Merge remote-tracking branch 'upstream/master'
2022-06-02 09:57:31 -05:00
SandPoot
2806f1ef7f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 15:46:12 -03:00
deathride58
1a918ed8db
animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game
2022-05-31 19:22:30 -04:00
TrojanCoyote
024e4dade1
Adds kitsune masks to loadout options
...
black and white kitsune masks go into loadout
2022-05-31 07:48:26 -05:00
Pin-alternative
b3b70bb319
Merge remote-tracking branch 'upstream/master' into cursed
2022-05-30 20:09:20 +10:00
Pin-alternative
c0f224efff
some more crap
2022-05-28 20:18:09 +10:00
BongaTheProto
1f741c6a00
Merge remote-tracking branch 'upstream/master'
2022-05-26 23:11:02 -05:00
BongaTheProto
411d7eb7d2
Makes extreme and harmful prefs save ( #256 )
2022-05-27 00:22:54 -03:00
BongaTheProto
85ab43e734
Merge remote-tracking branch 'upstream/master'
2022-05-21 03:00:06 -05:00
SandPoot
89fa5c0bfe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-21 00:13:59 -03:00
SandPoot
da1f58f297
Update files
2022-05-19 13:23:17 -03:00
BongaTheProto
a0e02ce288
Merge branch 'Sandstorm-Station:master' into master
2022-05-18 18:53:09 -07:00
BongaTheProto
78c722f20a
Fixes lust saves and adds stepping logs ( #252 )
2022-05-18 22:45:32 -03:00
BongaTheProto
767ab375f8
Merge remote-tracking branch 'upstream/master'
2022-05-18 08:02:44 -05:00
SandPoot
1e579c48fa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-18 02:49:40 -03:00
SandPoot
5dad84a486
Update files
2022-05-16 21:44:25 -03:00
BongaTheProto
43f220ad54
Merge remote-tracking branch 'upstream/master'
2022-05-15 22:09:13 -05:00
SandPoot
eee01dd764
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-15 23:43:09 -03:00
Lin
f2ca3a067d
Merge pull request #15617 from timothyteakettle/timothyteakettle-patch-1
...
poly alt cloak can now be renamed/dedescriptioned in loadout
2022-05-16 02:31:01 +00:00
Timothy Teakettle
3157a11209
Update neck.dm
2022-05-13 15:36:05 +01:00
BongaTheProto
6950996460
crawling under + no under (lol)
...
- crawling under tables
- no more unders spawn with jumpsuits (?)
2022-04-26 17:10:31 -05:00
BongaTheProto
479b497b00
ok
2022-04-19 01:30:44 -05:00
AManWithAToolbox
dda0869f82
Merge branch 'pr/1' into its-wasnt-gonna-happen
2022-04-18 23:19:18 -05:00
BongaTheProto
6ada3f7c94
Merge remote-tracking branch 'upstream/master' into its-wasnt-gonna-happen
2022-04-18 21:36:14 -05:00
SandPoot
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
nullfag
ea17a468a8
naked flavor text
2022-04-15 00:37:05 +02:00
BongaTheProto
a4fac709c3
Merge remote-tracking branch 'upstream/master'
2022-04-09 11:43:45 -05:00
SandPoot
ada0ea7f32
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-09 02:40:23 -03:00
SandPoot
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
silicons
dee1db4a3a
Merge pull request #15558 from SandPoot/mechs-are-vehicles
...
/obj/mecha ➡ /obj/vehicle/sealed/mecha
2022-04-08 18:26:47 -07:00
SandPoot
586a035132
Update files
2022-04-06 18:41:31 -03:00
SandPoot
282941ca5b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-31 00:21:11 -03:00
BlueWildrose
3687361ba5
Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) ( #15304 )
...
* Butts
* testicle fix + hidden is back
* updated booba
* prob bad idea actually thinking about icon states
* fuck
* this should be everything now
* SandPoot's suggestion
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
* tguify that last option
* Revert "tguify that last option"
This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.
* Revert "Merge branch 'master' into cursingcitadel"
This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.
* Revert "Revert "Merge branch 'master' into cursingcitadel""
This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.
Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2022-03-30 20:06:00 -07:00
SandPoot
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
BongaTheProto
7dc36994a9
Merge remote-tracking branch 'upstream/master'
2022-03-14 13:31:20 -05:00
SandPoot
07fe9bdbca
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-03-14 15:09:35 -03:00
silicons
a3284a0923
Merge pull request #15195 from DeltaFire15/med-revivalchem-nerf
...
Weakens chemistry's revival chems
2022-03-13 14:24:57 -07:00
BongaTheProto
8eef5107da
Merge branch 'Sandstorm-Station:master' into master
2022-03-04 18:37:53 -06:00
SandPoot
45580ae0e2
unused
2022-03-04 13:33:32 -03:00
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05:00
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -03:00
silicons
edd3a510f1
Merge pull request #15526 from timothyteakettle/bartender-pda
...
adds bartender cartridge for drink recipe searching, updates chemist cartridge to have equivalent functionality for all recipes
2022-02-26 18:08:47 -07:00
SandPoot
5029af901b
Upload files
2022-02-25 16:58:09 -03:00
Timothy Teakettle
027002f928
haha what if we didn't show secretcatchem
2022-02-23 12:07:03 +00:00
BongaTheProto
354d983a32
Merge remote-tracking branch 'upstream/master'
2022-02-20 00:24:28 -05:00
SandPoot
22a4a807df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-19 18:01:26 -03:00
Timothy Teakettle
c9051a6a08
adds polychromic clown outfit and mask ( #15359 )
...
* why
* polyclown
* outfit / loadout / etc
* its not pink what do you mean
* newline
* fixes
* test icon diffs
2022-02-18 14:38:50 -08:00
