Commit Graph

68578 Commits

Author SHA1 Message Date
Verkister
138a3712e3 Update portable_turret.dm 2022-03-20 02:35:13 +02:00
Verkister
57b8246443 Snips some ascended spaghetti code
Makes turrets more optimized and less prone to catastrophic runtime cascades. Go smooth that galaxy brain and take your rube goldberg ass spaghetti back to where it came from. Miight toss upstream at some point but I'm too sleepy to beef with the author responsible rn.
2022-03-20 02:30:27 +02:00
Razgriz
93703fe9a0 Merge pull request #3870 from CHOMPStation2/upstream-merge-12460
[MIRROR] Should fix runtime
2022-03-19 17:09:39 -07:00
CHOMPStation2
ea6048471c Should fix runtime 2022-03-19 22:15:44 +00:00
Casey
e6504feb6a Merge pull request #12460 from Very-Soft/runtimetime
Should fix runtime
2022-03-19 22:15:44 +00:00
Razgriz
9ba24cd3c4 Merge pull request #3868 from Verkister/patch-80
Earlyports fix for illiterate mobs
2022-03-19 11:46:18 -07:00
Verkister
3a3f31f7fb Earlyports fix for illiterate mobs
Fixes paper text contents being censored to simplemobs with universal_understand enabled.
2022-03-19 20:21:13 +02:00
Razgriz
42adf44fb0 Merge pull request #3850 from CHOMPStation2/upstream-merge-12440
[MIRROR] Adding Mining AOE PKA Upgrade to the Protolathe
2022-03-18 23:33:45 -07:00
Razgriz
4d5067554d Merge pull request #3864 from CHOMPStation2/NS-Mines-Try2
Add northern star mines
2022-03-18 23:18:22 -07:00
Razgriz
28cc2552a5 Merge pull request #3867 from CHOMPStation2/Razgriz1032-patch-9
stop
2022-03-18 23:17:04 -07:00
Razgriz
14792ea49a stop 2022-03-18 22:47:37 -07:00
Razgriz
f93201570a Merge pull request #3865 from CHOMPStation2/upstream-merge-12452
[MIRROR] D-Type REG engine
2022-03-18 22:38:57 -07:00
Razgriz
77fa6a591f Update _away_mission_tests.dm 2022-03-18 22:38:24 -07:00
Razgriz
9347a0cde1 Fix active edges 2022-03-18 22:38:01 -07:00
Razgriz
f1475f2b96 Merge pull request #3866 from CHOMPStation2/upstream-merge-12457
[MIRROR] Adds Submit To Prey Trait
2022-03-18 22:31:33 -07:00
Razgriz
2bd9634587 Make new NS mine floor airless 2022-03-18 22:21:50 -07:00
CHOMPStation2
05ccad26bf Adds Submit To Prey Trait 2022-03-19 04:43:02 +00:00
Casey
427f0f37f6 Merge pull request #12457 from Heroman3003/pred-bottom
Adds Submit To Prey Trait
2022-03-19 04:43:02 +00:00
CHOMPStation2
81606f3478 D-Type REG engine 2022-03-19 04:38:50 +00:00
Casey
807bd35e67 Merge pull request #12452 from Very-Soft/wheel
D-Type REG engine
2022-03-19 04:38:50 +00:00
Razgriz
baf48c1bda some fancy bullshit for testing 2022-03-18 21:21:27 -07:00
Razgriz
ded93a86d7 test 2022-03-18 21:08:37 -07:00
Razgriz
37df6136d4 Update northern_star.dm 2022-03-18 21:08:04 -07:00
Razgriz
0787f7a63c test 2022-03-18 21:06:35 -07:00
Razgriz
1c72b09291 Merge branch 'master' into NS-Mines-Try2 2022-03-18 20:37:44 -07:00
Razgriz
d81df1171b Add northern star mines 2022-03-18 20:35:34 -07:00
Razgriz
d6f29b9507 Merge pull request #3861 from CHOMPStation2/upstream-merge-12449
[MIRROR] Adds a choice between shotguns available to wardens.
2022-03-18 18:52:10 -07:00
Razgriz
d80abb7ec2 powder that makes you say yes 2022-03-18 18:46:26 -07:00
Razgriz
9b51a9f978 Merge pull request #3690 from harry3124/Yuliy-Gateway-Snowfield_1
Re-opening Gateway/Snowfield Update
2022-03-18 18:45:20 -07:00
Razgriz
efc91db69e Update southern_cross_defines.dm 2022-03-18 16:27:05 -07:00
Razgriz
27306828a6 Merge pull request #3860 from CHOMPStation2/upstream-merge-12448
[MIRROR] Makes PSay and PMe obey Ghost Privacy pref
2022-03-18 14:29:38 -07:00
Razgriz
b4313f5c8b Merge pull request #3859 from CHOMPStation2/upstream-merge-12444
[MIRROR] Atmos Extinguisher sprite fix
2022-03-18 14:28:31 -07:00
Razgriz
fc8cb5558a Merge pull request #3862 from CHOMPStation2/upstream-merge-12456
[MIRROR] Fixes Dominate Preadator/Prey not giving proper verbs
2022-03-18 14:27:33 -07:00
CHOMPStation2
ebc2b835cd Fixes Dominate Preadator/Prey not giving proper verbs 2022-03-18 20:14:37 +00:00
Casey
3d5d2d3404 Merge pull request #12456 from Heroman3003/domfix1
Fixes Dominate Preadator/Prey not giving proper verbs
2022-03-18 20:14:37 +00:00
CHOMPStation2
ff407c7a57 Adds a choice between shotguns available to wardens. 2022-03-18 19:34:18 +00:00
Casey
2b3bb75044 Merge pull request #12449 from BonniePandora/Warden's-delight
Adds a choice between shotguns available to wardens.
2022-03-18 19:34:18 +00:00
CHOMPStation2
e68c0d6f5b Makes PSay and PMe obey Ghost Privacy pref 2022-03-18 19:33:11 +00:00
Casey
001b645447 Merge pull request #12448 from Heroman3003/privacyforpred
Makes PSay and PMe obey Ghost Privacy pref
2022-03-18 19:33:11 +00:00
CHOMPStation2
3c34dcb726 Atmos Extinguisher sprite fix 2022-03-18 19:32:05 +00:00
Casey
78d1725785 Merge pull request #12444 from BonniePandora/Atmos-Extinguisher-sprite-fix
Atmos Extinguisher sprite fix
2022-03-18 19:32:05 +00:00
Razgriz
2b022f78cb Merge pull request #3856 from CHOMPStation2/Razgriz1032-patch-8
Reorganize map defines to match in-game z-levels
2022-03-17 23:47:21 -07:00
Razgriz
54146258ec Micro recoil from 51% to 70%
Because 51 is memes and wierd number and we have size traits now that make you smaller.
2022-03-17 23:36:29 -07:00
Razgriz
8c3e65899f Merge pull request #3843 from CHOMPStation2/upstream-merge-12434
[MIRROR] Small Pilot QoL additions
2022-03-17 23:29:14 -07:00
Razgriz
ff3a70c3b5 Update southern_cross_defines.dm 2022-03-17 23:29:04 -07:00
Razgriz
1ff648113c Update southern_cross_defines.dm 2022-03-17 23:11:18 -07:00
Razgriz
edeeb9cdb3 Reorganize map defines to match in-game z-levels
Because not having them match in-game z levels causes issues
2022-03-17 22:50:48 -07:00
BlackMajor
5bea0959bb Merge pull request #3854 from CHOMPStation2/vore
vore
2022-03-16 20:31:24 +13:00
Razgriz
d6d6fedc6a vore
vore
2022-03-16 00:26:59 -07:00
Razgriz
5eb06cab19 Merge pull request #3853 from BlackMajor/tilen't
Fixes infinite tile material loop
2022-03-16 00:21:11 -07:00