Commit Graph

569 Commits

Author SHA1 Message Date
silicons
8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
2020-10-01 03:01:18 -07:00
Putnam
6f6e330984 Removes removeNullsFromList, cause it doesn't work. 2020-09-24 01:15:22 -07:00
Artur
435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Timothy Teakettle
f1cd94fc97 emp rework 2020-09-09 23:14:06 +01:00
silicons
de8067761a Update meteor_wave.dm 2020-09-05 13:12:45 -07:00
silicons
a58a67f90c Merge pull request #13339 from Putnam3145/dynamic-event-decouples
Completely decouples events from dynamic.
2020-09-05 02:12:00 -07:00
Putnam
bb9374a3f0 Significantly reduced chance of severe trauma, too. 2020-09-03 18:15:58 -07:00
Putnam
c48dd86e6e Makes brain trauma not roll lobotomy-resist and only happen when there's doctors. 2020-09-03 18:03:11 -07:00
Putnam
4ef4220c88 Completely decouples events from dynamic. 2020-09-03 16:38:16 -07:00
Artur
3bef4ba35e TGUI updates + statpanel 2020-09-02 17:52:47 +03:00
Putnam
177bfaefaf Added health exemption to a couple events that need it. 2020-08-29 04:46:18 -07:00
silicons
188bb13272 Merge pull request #13181 from Putnam3145/dynnamic
Dynamic: tweaks and fixes: the reckoning
2020-08-22 15:22:19 -07:00
silicons
a4aeb38433 Merge pull request #13221 from Ludox235/fuck-lowpop-xenos
>10 pop xenos >FOR (ALLEGEDLY) 5 YEARS
2020-08-22 15:19:21 -07:00
Ludox
d51af28f77 Bumps min-pop to 25
Ahahah 3 years that we can have 10 pop xenos :)
2020-08-20 14:39:04 +02:00
Hatterhat
0c4a3c740d >metabreaks >2020 2020-08-18 21:50:57 -05:00
Putnam
f54d272b11 Yet more dynamic tweaks. 2020-08-15 23:38:21 -07:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Letter N
f1c4a7f6ac Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-09 14:54:16 +08:00
silicons
e1e9b77b07 Update immovable_rod.dm 2020-08-07 00:36:04 -07:00
Letter N
333ca2cc7b Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-06 18:26:04 +08:00
silicons
57be216251 Merge pull request #12995 from timothyteakettle/travelling-traders
a few small tweaks to travelling traders
2020-08-05 15:28:15 -07:00
Letter N
a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08:00
timothyteakettle
d05c694ffe trader tweaks 2020-08-02 01:57:46 +01:00
Letter N
b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08:00
Letter N
5d4bb48628 another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator 2020-07-29 15:10:01 +08:00
Lin
81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
2020-07-28 21:51:10 -05:00
DeltaFire
9f3e7755ae two line fix
tin
2020-07-27 21:30:13 +02:00
silicons
22efdbffcd woops 2020-07-26 23:08:41 -07:00
silicons
b20e3bc2b6 monkey attacks 2020-07-23 16:30:27 -07:00
silicons
ffd44b78ba Merge remote-tracking branch 'citadel/master' into clickcd_experimental 2020-07-23 10:26:03 -07:00
silicons
1d99591b6b Merge pull request #12807 from kappa-sama/patch-32
lowers stray cargo pod weight from 2x normal to 1/2 normal
2020-07-20 16:57:24 -07:00
silicons
98d3ac80d9 :pika: 2020-07-20 11:25:17 -07:00
kappa-sama
6cd9993e50 5 2020-07-17 15:54:45 -04:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Timothy Teakettle
c0687886e4 using initial is better practice 2020-07-12 21:38:09 +01:00
Timothy Teakettle
0705130448 small edgecase 2020-07-12 17:31:37 +01:00
timothyteakettle
8e31e3c534 a tonne of fixes 2020-07-12 01:56:24 +01:00
timothyteakettle
ab01a69c1f bugfix 2020-07-12 00:53:31 +01:00
timothyteakettle
8712dd6de4 bugfixes 2020-07-12 00:31:45 +01:00
Timothy Teakettle
c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
silicons
926f64e13d Merge pull request #12722 from kappa-sama/patch-31
lowers wisdom cow's spawnrate to standard and makes it 66% less spammy
2020-07-11 00:49:29 -07:00
timothyteakettle
e571400b1b lots of bug fixes 2020-07-11 03:35:15 +01:00
Timothy Teakettle
75b9eef74e bug fixes 2020-07-10 22:52:08 +01:00
Timothy Teakettle
045169e1ee actual trader subtypes 2020-07-10 22:50:22 +01:00
Timothy Teakettle
60b9e9dafe trader event/mob 2020-07-10 21:06:53 +01:00
kappa-sama
af106b7628 10 2020-07-09 16:12:07 -05:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00