Commit Graph

732 Commits

Author SHA1 Message Date
Putnam3145
8ab1a12ef7 i forgot to compile?? 2022-08-02 23:15:10 -07:00
Putnam3145
0238d9fbe5 make it actually do something lol 2022-08-02 21:50:56 -07:00
Putnam3145
db06dbcd58 forgot to commit and push 2022-08-02 16:44:05 -07:00
Putnam3145
8456caa095 Makes untied shoes take lacing difficulty into account 2022-08-02 13:28:01 -07:00
deathride58
5d0c6405c6 Merge pull request #15730 from Putnam3145/event-rebalance
Rebalances some events
2022-07-30 11:27:08 -04:00
Putnam3145
5ec0f537eb C 2022-07-28 17:25:46 -07:00
Putnam3145
6e0a17a525 Untied shoes: a minor event of little consequence 2022-07-28 17:19:35 -07:00
Putnam3145
70ff90adcf the risks of having disabled code 2022-07-28 16:56:12 -07:00
Putnam3145
01c945d690 Rebalances some event player counts 2022-07-28 16:18:35 -07:00
deathride58
578eb440c1 If you know, you know; fixes a decade-old typo, essentially mirroring RP's typo fix 2022-07-20 16:51:38 -04:00
Timothy Teakettle
80c70efb70 Update brain_trauma.dm 2022-07-18 12:27:10 +01:00
SandPoot
2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
SandPoot
586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot
189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
Solaris-Shade
0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade
2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot
5029af901b Upload files 2022-02-25 16:58:09 -03:00
silicons
a7993cd916 Merge pull request #15419 from Putnam3145/funny-atmos-event
Adds an event that speeds up/slows down atmos
2022-01-22 04:34:42 -08:00
Putnam3145
5f7ef21a7c More supernova tweaks 2022-01-10 21:56:48 -08:00
DeltaFire
b3f0a74ff9 delay returns 2021-12-14 18:40:33 +01:00
Putnam3145
74ecee8253 Atmos flux event 2021-12-07 21:40:02 -08: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
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08: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
Lin
5066e34736 Merge pull request #15258 from keronshb/pirate10k
Raises Pirate pay rate back to 10000 again.
2021-10-24 15:09:03 -07:00
keronshb
daeaacd81c Removes Dynamic's ability to hijack loneop 2021-10-15 22:04:01 -04:00
SandPoot
829ca8b9a7 Merge branch 'master' into tgui-alerts-and-what-not 2021-10-11 20:41:56 -03:00
keronshb
1c754b814e Pirates pay raise documented 2021-10-09 00:47:16 -04:00
keronshb
fce4eb0476 Merge branch 'dynamicport' 2021-10-09 00:28:30 -04:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
DeltaFire
c5476daeec revert 2021-10-08 23:51:34 +02:00
Putnam3145
3cfaad31c1 Merge pull request #15149 from keronshb/dynamicport
(Probably ready for test merge) DYNAMIC 2021
2021-10-07 18:14:59 -07: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
keronshb
deaab16e55 Ninja hijack in dynamic 2021-09-30 23:49:51 -04:00
keronshb
3bda0e9015 Pirate fix 2021-09-26 21:00:48 -04:00
keronshb
a6bfff92cc Fixes pirates, re adds extended, re adds voting 2021-09-24 19:40:56 -04:00
KrabSpider
11a414d8c8 blacklists cryogenics from anomaly spawns
adds cryogenics to the anomaly blacklist.
2021-09-20 16:41:40 -04:00
keronshb
c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport 2021-09-19 18:09:18 -04:00
keronshb
cd00d1589e fucking hell 2021-09-19 18:06:24 -04:00
keronshb
0b5a7c9759 OOPS FORGOT PIRATES and some blacklists 2021-09-19 17:56:26 -04:00
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
#	tgstation.dme
2021-09-19 15:23:52 -04:00
silicons
c4386c0a4f Merge pull request #15175 from buffyuwu/hallucination
meme pr that adds a hallunciation sound
2021-09-19 11:11:05 -07:00
buffyuwu
bdf46b1d46 meme pr 2021-09-18 04:53:17 -04:00
keronshb
518c54c061 Adds the correct hijack 2021-09-16 15:52:53 -04:00
keronshb
f2b7dba990 More fixes? 2021-09-15 18:52:24 -04:00
keronshb
edde5043dd More fixes, more errors 2021-09-15 15:55:59 -04:00
keronshb
4eaeccf8d8 Fixes more errors 2021-09-15 15:25:26 -04:00