silicons
9bf6ac8faf
damnit
2022-04-27 23:08:28 -07:00
Captain277
b82fb30248
Conflict Fix
2022-04-27 21:03:20 -07:00
CitadelStationBot
b35ef97213
Automatic changelog generation for PR #3947 [ci skip]
2022-04-27 22:49:48 -05:00
crystal
1631307fee
I am the Globglogabgalab (Engineering Buff 2.0) ( #3947 )
...
* Update manuals.dm
* adds books
2022-04-27 20:49:46 -07:00
Captain277
3a2dac1e29
Engine Rework
2022-04-27 20:11:28 -07:00
Captain277
a1a45db981
Merge branch 'master' into perspectives
2022-04-27 19:14:19 -07:00
silicons
914c953bb8
Update mob_defines.dm ( #3943 )
2022-04-27 19:10:09 -07:00
Captain277
063cd025b0
Fixes Conflict
2022-04-27 19:07:28 -07:00
Captain277
b186590568
Merge branch 'master' into Captains-Locker
2022-04-27 19:03:37 -07:00
CitadelStationBot
7b9c6f3ff0
Automatic changelog generation for PR #3940 [ci skip]
2022-04-27 20:59:33 -05:00
silicons
b699a0543f
Merge pull request #3940 from Citadel-Station-13/Mekkyaku
...
Adds the Mekkyaku Coat
2022-04-27 18:59:30 -07:00
Captain277
bc9b7628a5
Captains Closet Adjustments
2022-04-27 18:15:07 -07:00
Changelogs
e4ec3c138b
Automatic changelog compile [ci skip]
2022-04-28 01:13:09 +00:00
silicons
268f34a804
small cargo code cleanup ( #3941 )
...
* move everything
* stuff
* done
* done
* i hate nanoui
* that
* listmaniia
* that
* okay that's a higgs bugson moment
* oh god git why
* a
* a
* fixes
* keyboard moment
2022-04-27 11:40:13 -07:00
CitadelStationBot
b1ceaab37b
Automatic changelog generation for PR #3923 [ci skip]
2022-04-27 13:39:56 -05:00
Felix
b0a079e246
Adds high performance gas/heat pumps ( #3923 )
...
* heat pump
* quck config clicks
* I forgot
* performance factor setting
* Heat pump power rating increase
* passive flow adjustment
* heatpump attackby proc
* zeropoint fix and UI adjustment
* Gas cooler perf reduction
* reduces perf to upstream values
* Un perfing for both heater and cooler,
back to the original values
* adds the "massive" gas pump, WIP
* Fixes a merge fuckup
* indents and whitespace corrections
* adds power supply
* circuit for the massive gas pump
* _vr merge clean up
* comments on atmos helpers
* massive gas pump and UI
* UI clean up
* oh and I probably should push the bundle as well..
* adds the circuit to rnd hopefully
* adds massive heatpump and its circuits
* adds the circuits to the map
* indention fix for js
* more indentions
* EVEN MORE INDENTIONS
* last indention?
* ICONS!
* Directional and different speeds for icons
2022-04-27 11:39:53 -07:00
IAmCrystalClear
54ca642f30
nonvamps shouldnt drain bloodbags
2022-04-27 19:25:09 +03:00
IAmCrystalClear
bc444af09d
introduce vampirism
2022-04-27 16:42:12 +03:00
silicons
adb47428ad
Merge remote-tracking branch 'citrp/master' into perspectives
2022-04-27 05:20:31 -07:00
silicons
a0108ba167
fixes
2022-04-27 05:07:30 -07:00
silicons
e52a8a3372
fixes
2022-04-27 04:43:10 -07:00
silicons
72f2fa2c4f
ugh
2022-04-27 04:15:44 -07:00
silicons
19a109b3e5
more
2022-04-27 03:14:00 -07:00
silicons
2f2259f149
fxies
2022-04-27 03:10:06 -07:00
silicons
5579e12885
i hate the byond antichrist
2022-04-27 02:51:04 -07:00
silicons
7df7eee301
ok
2022-04-27 02:49:05 -07:00
silicons
30d4fb8a75
ok
2022-04-27 02:47:36 -07:00
silicons
3abb53205b
well it compiles
2022-04-27 02:42:48 -07:00
silicons
a6e4af5a31
fixes
2022-04-27 02:21:21 -07:00
Zandario
0be567fceb
Some code cleaning. ( #3939 )
2022-04-27 01:43:18 -07:00
fake_vm_user
a4899d0395
updates
2022-04-26 23:24:27 -07:00
fake_vm_user
7cab6c0844
wacky
2022-04-26 23:23:30 -07:00
fake_vm_user
d7551bb121
a
2022-04-26 22:44:41 -07:00
fake_vm_user
c50558cf91
more
2022-04-26 22:37:22 -07:00
fake_vm_user
9095cef98b
Merge remote-tracking branch 'citrp/master' into perspectives
2022-04-26 21:46:10 -07:00
Changelogs
a8453c8381
Automatic changelog compile [ci skip]
2022-04-27 01:01:47 +00:00
CitadelStationBot
f76ba5bbd0
Automatic changelog generation for PR #3936 [ci skip]
2022-04-26 15:21:22 -05:00
Zandario
db39fde779
Butchering, Macro standardization, and generic tidying ( #3936 )
...
* Beginning
* Moar
* Blelelelele
* Robo Organs *Flooshed*
* Went overboard and organized a shit ton of tags...
* Partially implements VOREStation#9287
* Performance fixes from Polaris#7759
* More Code Cleaning
* Recompiled TGUI Bundle
2022-04-26 13:21:19 -07:00
silicons
e06e04282f
Update augmented_holder.dm ( #3935 )
2022-04-26 12:54:58 -07:00
Captain277
7ac12b890b
Slimming
2022-04-26 02:02:53 -07:00
Captain277
4d6706ee3b
Snowflake
2022-04-26 01:27:27 -07:00
Zandario
8954c2c611
Merge pull request #3930 from Citadel-Station-13/Tiny-Hair-Tweak
...
Makes My Preferred Hairstyle Able to be Tied
2022-04-25 22:35:32 -05:00
CitadelStationBot
a0bf96cc71
Automatic changelog generation for PR #3937 [ci skip]
2022-04-25 22:35:18 -05:00
Zandario
326815dfb7
Merge pull request #3937 from Citadel-Station-13/Swimsuit-Hotfix-Hotfix
...
The Hotfix To the Hotfix
2022-04-25 22:35:16 -05:00
silicons
209e7c0dfe
wacky... ( #3932 )
2022-04-25 20:34:23 -07:00
silicons
92c50a3afd
fixes zasfire again ( #3927 )
...
* g
* Update turf_changing.dm
2022-04-25 20:31:49 -07:00
Changelogs
3a36db621c
Automatic changelog compile [ci skip]
2022-04-26 00:54:29 +00:00
fake_vm_user
1ec4b4ba47
about 200 replacements left
2022-04-25 14:01:06 -07:00
fake_vm_user
5fa6608415
fixes
2022-04-25 13:53:00 -07:00
CitadelStationBot
2c8e69b149
Automatic changelog generation for PR #3922 [ci skip]
2022-04-25 12:06:59 -05:00
