BongaTheProto and GitHub
07a1011cc8
Merge branch 'Sandstorm-Station:master' into master
2021-11-24 23:06:03 -05:00
SandPoot
ed053988d8
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-24 22:11:23 -03:00
Lin and GitHub
d5c17f0d84
Merge pull request #15376 from SandPoot/double
...
Double beds
2021-11-24 17:38:10 +00:00
Lin and GitHub
e3a5391250
Merge pull request #14868 from Arturlang/admin_mapsave
...
buildmode mapgen tool save [ready]
2021-11-24 17:32:48 +00:00
LetterN
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
keronshb
af83fb9611
FestiveMap 2021
2021-11-20 12:04:35 -05:00
BongaTheProto and GitHub
68015817b3
Merge branch 'Sandstorm-Station:master' into master
2021-11-20 02:55:56 -05:00
SandPoot
2f8bfa8667
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-20 01:38:26 -03:00
Artur
99dedb54ed
Merge remote-tracking branch 'upstream/master' into admin_mapsave
2021-11-20 00:16:56 +02:00
E
cf757b84af
more ashie shit
2021-11-18 23:18:24 +01:00
MrJWhit
47cf0c153a
Update loot_pile.dm
2021-11-17 18:36:49 -05:00
BongaTheProto
703413027c
Merge remote-tracking branch 'upstream/master'
2021-11-17 14:33:29 -05:00
SandPoot
34900425aa
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-11-17 13:48:32 -03:00
Lin and GitHub
efa02148d1
Merge pull request #15275 from keronshb/halloweenball2021
...
Spookystation (Ball Map) and Vector Cars
2021-11-17 16:26:07 +00:00
LetterN
fa6946fae4
added the funny. Also adds balloon_alert to more stuff (primarily atmos)
2021-11-16 16:10:12 +08:00
SandPoot
ca3eaca314
update bedsheet_bin.dm
2021-11-15 20:48:11 -03:00
SandPoot
5b85c260a7
Upload files
2021-11-15 01:34:30 -03:00
DeltaFire
6224da71a3
contents_explosion
...
at least this one had less overrides.
2021-11-14 21:41:42 +01:00
DeltaFire
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
BongaTheProto
41c7851319
Revert "Revert "Merge pull request #3 from NullFag/ashies""
...
This reverts commit 6ad6a448aa
2021-11-14 01:30:30 -05:00
BongaTheProto
6ad6a448aa
Revert "Merge pull request #3 from NullFag/ashies"
...
This reverts commit 239442d1ba78e7e3b157
2021-11-14 01:13:53 -05:00
E
7efba191d3
most of ashies' shit (w/o heat/ashen hair)
2021-11-14 04:35:13 +01:00
LetterN
8b16653744
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-12 08:50:23 +08:00
keronshb
0aceecee2e
w hitsound
2021-11-10 16:49:18 -05:00
keronshb
efd12e4fd5
Changes for merge
2021-11-01 12:07:44 -04:00
SandPoot
f1f6ac0109
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-31 22:14:23 -03:00
Lin and GitHub
b6ad2f6a6b
Merge pull request #15312 from keronshb/evergreen
...
The grinch can no longer steal Christmas.
2021-10-30 14:08:59 -07:00
LetterN
1fc778f70a
soundloop fix. also it gets deleted (woo)
2021-10-30 13:16:31 +08:00
LetterN
a057139c33
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-10-30 11:54:20 +08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
silicons and GitHub
319c5e23fe
Merge pull request #15309 from LetterN/revert-15244-tgui-alerts-and-what-not
...
Revert "TGUI alerts, lists, inputs"
2021-10-29 20:27:46 -07:00
Lin and GitHub
5054ea87ce
Merge pull request #15310 from keronshb/jaqincinerator
...
No Frollo you can't burn Jacq in the cremator with hellfire (plus two other grief prevention additions)
2021-10-28 21:29:50 -07:00
keronshb
e531c7b452
Fix
2021-10-28 18:48:26 -04:00
keronshb
6dcf4fae9f
No stealing christmas
2021-10-28 11:28:59 -04:00
LetterN
f7b898a2a9
frontend
2021-10-28 17:34:52 +08:00
keronshb
e8c56c07ee
No burning the spirit of halloween
2021-10-28 00:43:02 -04:00
Letter N and GitHub
bcdf96f274
Revert "TGUI alerts, lists, inputs"
2021-10-28 12:17:29 +08:00
SandPoot
32a6e63698
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 23:11:54 -03:00
SandPoot
13d7a166fe
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not
2021-10-27 13:54:49 -03:00
SandPoot
e5badd2e09
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-27 13:31:55 -03:00
Artur
bfcdf83e55
buildmode mapgen tool save
2021-10-26 16:31:36 +03:00
Linzolle
a4a72b1b16
make plasmemes not die in ghost cafe
2021-10-24 17:27:32 -07:00
SandPoot
45ef0fe5ca
closes #15278
2021-10-17 21:40:39 -03:00
keronshb
3cfea7eb92
Ball2021
2021-10-16 00:02:05 -04:00
SandPoot and GitHub
829ca8b9a7
Merge branch 'master' into tgui-alerts-and-what-not
2021-10-11 20:41:56 -03:00
SandPoot
2541ad050b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-10 21:07:48 -03:00
11df2bb77c
fixes emps not working on lockers ( #15259 )
...
* Update closets.dm
* Update code/game/objects/structures/crates_lockers/closets.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com >
2021-10-11 00:48:00 +02:00
SandPoot
5aa12b4716
There's a bounty for this right? i spent nearly two full days at this
2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a
Upload files
2021-10-05 00:33:49 -03:00
SandPoot
be2a85d9d0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2021-10-03 15:41:30 -03:00
