Commit Graph

28573 Commits

Author SHA1 Message Date
Lin
4a7e6e5b00 Merge pull request #14945 from timothyteakettle/plant
fixes photosynthesis stopping nutrition going past well fed from non-photosynthesis means
2021-07-17 09:50:20 -07:00
Timothy Teakettle
07fec51d92 fix 2021-07-15 16:44:48 +01:00
Putnam3145
cf3c600938 doy 2021-07-13 22:13:25 -07:00
Putnam3145
9d9b74276e Fixes a major source of lag 2021-07-13 22:07:26 -07:00
Lin
d50eb91632 Merge pull request #14921 from Putnam3145/componentize-acid
Componentizes acid
2021-07-13 11:52:43 -07:00
Lin
1bf06983dc Merge pull request #14938 from Putnam3145/hotspot-fix
Makes fire visuals respect hyper-nob
2021-07-13 11:39:36 -07:00
Lin
114df4e717 Merge pull request #14920 from Putnam3145/fix-activity-runtime-again
Fixes a runtime in activity tracking
2021-07-12 00:03:53 -07:00
Lin
daf837f89e Merge pull request #14924 from Citadel-Station-13/restraints
handcuffs now require you to stand still to break out of again. Buffs bolas and energy snares breakout time because I forgot to do that when I made you able to move while breaking out of it
2021-07-12 00:03:39 -07:00
Lin
3b1bef2729 Merge pull request #14922 from Putnam3145/remove-dirt-buildup
Removes causes_dirt_buildup_on_floor and replaces it with just making humans do that in their Move
2021-07-11 10:27:31 -07:00
Putnam3145
70a5dd3693 yes 2021-07-10 22:53:14 -07:00
Putnam3145
cf9cb01f3a makes fire visuals respect hyper-nob 2021-07-10 14:26:48 -07:00
silicons
d0b3857cb6 Merge pull request #14842 from WanderingFox95/WanderingFox95-TheWheelchairPRs
[Ready] Wheelchair Sprite Rollback + Motorized Hoverchairs
2021-07-09 16:50:00 -07:00
Lin
08e3a03c29 Merge pull request #14923 from Citadel-Station-13/silicons-patch-45
fixes handcuff resisting being instant
2021-07-06 12:04:39 -07:00
DeltaFire
dd71d12359 aaaaaaaaa 2021-07-05 15:28:39 +02:00
silicons
18fb23bb1f Update carbon.dm 2021-07-04 18:19:31 -07:00
silicons
472fda9504 Merge pull request #14833 from zeroisthebiggay/finallytools
TG Resprite Compendium Atomization Project | Episode Eight: The Finale: TG Tools
2021-07-04 10:59:43 -07:00
silicons
2b1aa8a6fc Merge pull request #14911 from Putnam3145/euclidean-diagonals
Makes diagonal movement euclidean
2021-07-04 10:58:08 -07:00
silicons
7c62baeb45 Merge pull request #14914 from Putnam3145/watcher-opt
Optimizes the slowest Life proc in the game to make it not do 81x as much work as it needs to
2021-07-04 10:57:30 -07:00
silicons
1620aa46da Update carbon.dm 2021-07-04 10:55:02 -07:00
silicons
2fb5355066 Update handcuffs.dm 2021-07-04 10:53:17 -07:00
silicons
65f22d7e72 Update handcuffs.dm 2021-07-04 10:52:47 -07:00
silicons
a419e6706c Update handcuffs.dm 2021-07-04 10:51:39 -07:00
silicons
ea6b0a4ed9 Update do_after.dm 2021-07-04 10:50:49 -07:00
Putnam3145
21c77d25a2 yeah yeah sure whatever 2021-07-03 22:40:09 -07:00
Putnam3145
2be56ab992 Removes causes_dirt_buildup_on_floor 2021-07-03 22:19:05 -07:00
Putnam3145
899e74fc83 Componentized acid 2021-07-03 22:10:44 -07:00
Putnam3145
e437f6514a Fixes a runtime in activity tracking 2021-07-03 21:09:27 -07:00
Putnam3145
970e089fb0 glass houses 2021-07-03 03:52:07 -07:00
Putnam3145
15078f0f71 Properly optimizes watchers 2021-07-03 03:50:43 -07:00
Putnam3145
e11cc190e7 Watcher optimization 2021-07-03 03:40:34 -07:00
Putnam3145
770bb9a4f1 Makes plumbing no longer SS_TICKER 2021-07-03 02:36:49 -07:00
Lin
5f312363e3 Merge pull request #14909 from DeltaFire15/slimepuddle-why
Changes turrets back to check for stamcrit instead of mobility_use
2021-07-02 00:51:18 -07:00
silicons
4fa81ba13c Merge pull request #14878 from Putnam3145/remove-sleeps
Hopefully fixes whatever requires SHOULD_NOT_SLEEP to be commented out in processing
2021-07-01 21:57:19 -07:00
Putnam3145
f1bcbc2573 Makes diagonal movement euclidean 2021-07-01 12:09:39 -07:00
Putnam3145
9068019bca Merge pull request #14903 from silicons/spray_fix
fixes and rewrites sprays
2021-07-01 10:55:28 -07:00
DeltaFire
3874d9d49d mobility moment 2021-07-01 02:24:37 +02:00
Putnam3145
f3b590f5f0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into remove-sleeps 2021-06-30 02:19:02 -07:00
silicons
a00ed83c5e Merge pull request #14883 from WanderingFox95/WanderingFox95-plushies
[Ready] The plushie PR you didn't know we needed (but we kinda did)
2021-06-29 08:51:24 -07:00
silicons
a29d107d33 Merge pull request #14899 from shellspeed1/blood-drunk-miner-drop
Moves tendril KA upgrade disks to blood drunk miner.
2021-06-29 08:51:10 -07:00
silicons
22ad8f2c8c Merge pull request #14893 from WanderingFox95/WanderingFox95-TheDailyWhiplash
[Ready] The Daily Whiplash (Newspaper Baton)
2021-06-29 08:50:48 -07:00
silicons
c7766b0f02 Merge pull request #14895 from shellspeed1/another-pod
Adds a new survival pod, the penthouse pod.
2021-06-29 08:48:55 -07:00
silicons
f4c6888f96 Merge pull request #14822 from qweq12yt/more-cargo-features
Solving inconsistencies regarding QM being command
2021-06-29 08:46:33 -07:00
silicons
4a5ca2b851 woo 2021-06-28 22:15:25 -07:00
silicons
7091b0467d cleaner 2021-06-28 19:30:00 -07:00
silicons
07af6b755f that 2021-06-28 19:17:15 -07:00
silicons
d59ced8f28 changes 2021-06-28 19:15:29 -07:00
silicons
5ef742ffc1 logic 2021-06-28 18:46:25 -07:00
silicons
e690cea147 fix 2021-06-28 18:33:14 -07:00
shellspeed1
26cb16311d A 2021-06-27 20:08:33 -07:00
Lin
0bfb671f4e Merge pull request #14482 from silicons/combat_v7
Combat v7 - Sprint removal, automatic block/parry, turns combat mode into a pure UI/interaction toggle with no side effects, and a truckload of other stuff.
2021-06-27 13:04:29 -07:00