292f67e098
Merge remote-tracking branch 'origin/master' into perlin-genny
2021-03-20 20:36:56 +08:00
79a464ca8c
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
...
Clockwork cult rite additions and other edits
2021-03-16 07:39:41 +01:00
935e46b492
The Mapping Update
...
Cleans up the map (again)
Makes mining code more better
2021-03-12 12:11:35 +08:00
939a493334
Merge pull request #14306 from Putnam3145/supernova
...
Adds a supernova event, with tweaks to allow this
2021-03-10 01:32:52 -07:00
34c4887b69
Merge pull request #14351 from Putnam3145/teg-uncap
...
Uncaps TEG output
2021-03-09 00:17:47 -07:00
cb346a3847
a
2021-03-05 14:29:36 +08:00
ca2f302d69
Rewords Nar'Sies death annoucement
2021-03-04 10:51:44 -05:00
b2f80555bb
hopefully fixes run linters, as well as rewords some announcements
2021-03-04 01:58:36 -05:00
1f8b7cda94
Uncaps TEG
2021-03-02 03:04:45 -08:00
311d766bd5
Adds a supernova event, with tweaks to allow this
2021-02-24 02:56:14 -08:00
5304029dd9
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-23 11:01:42 +08:00
037378eb7d
Merge remote-tracking branch 'origin/master' into hardsync-1.5
2021-02-19 10:34:47 +08:00
123de14009
upload files
2021-02-18 15:05:39 -03:00
f738023097
Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing"
...
This reverts commit 2e29f30fdf724910cfab
2021-02-18 15:04:46 -03:00
2e29f30fdf
Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing
2021-02-18 15:04:22 -03:00
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
2ec2f55eb7
updates fork
2021-02-17 12:03:28 -05:00
3cac44b2f0
a
2021-02-15 19:35:16 -07:00
45d6a5f87f
it compiles, UNTESTED YET
2021-02-13 21:41:59 +08:00
fb75c6a949
adds in ending sequence for Ratvar spawning, + various other changes
...
above, as well as cancelling out each gods round end sequence depending on who wins their fight, plus some description edits which make more sense with the station based setting
2021-01-22 00:04:04 -05:00
48d8ffc9a7
reverts every change slowing down developement of this PR
2021-01-21 23:42:23 -05:00
04d5721c4d
Merge branch 'master' into clockcultrework_v2
2021-01-14 19:51:15 -05:00
ddad368d6a
Merge remote-tracking branch 'citadel/master' into tgsync
2021-01-08 00:33:57 -08:00
0c87c3b0e0
fiX
2020-12-28 12:15:55 -08:00
1095142a5f
Merge remote-tracking branch 'origin/master' into semi-sync
2020-12-26 10:58:12 +08:00
971ea2010f
Merge pull request #13865 from Citadel-Station-13/silicons-patch-41
...
cell/proc/give() no longer lets you give negative charge
2020-12-25 19:46:16 +01:00
488bf18106
Update apc.dm
2020-12-24 21:31:02 -07:00
f2b16b82fc
Update cell.dm
2020-12-24 21:26:25 -07:00
56fb81d02c
Immursive Audio 2
2020-12-24 11:06:49 +08:00
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
a20f14b937
Merge pull request #13705 from Putnam3145/buff-rad-collector
...
Buffs rad collectors
2020-11-25 22:23:17 -07:00
f301ed4f8f
Merge pull request #13689 from DeltaFire15/apc-power-fuckery
...
Fixes APC recharge power use
2020-11-25 22:21:57 -07:00
ac20bb7d8c
fixes up a tiiny cell charge oversight
2020-11-24 19:43:14 +01:00
a7fc05a1c7
Buffs rad collectors.
2020-11-24 06:43:17 -08:00
adc2af2dde
typo
2020-11-18 22:51:54 +01:00
e24b26c7e6
fixes APCs using nearly no power
2020-11-18 22:47:28 +01:00
5b03f5b0ec
more
2020-11-12 23:36:18 -07:00
a7936efafc
Merge branch 'master' into clockcultrework_v2
2020-11-12 16:12:05 -05:00
91584053f5
Fixes a bunch of fallout from the tgui PR ( #13648 )
...
* screamies
fixes a bunch of fallout from the tgui PR.. probably
* Empty commit to poke travis
2020-11-01 21:59:22 +01:00
8fe7c23766
Clockwork generators
...
TODO: get it to stop dividing by zero for power production and fuel usage, make it generate power.
2020-10-28 08:44:42 -04:00
d3616f2d17
Fixes hijack UI ( #13598 )
...
* Fixes hijack UI
* This was lost too it seems
* And this
* More stuff that was removed
* Should be good now
* Nice and proper now
2020-10-24 21:23:52 +02:00
4f734f68a9
moves damage checks
...
title. Makes it harder to circumvent them.
2020-10-11 16:18:25 +02:00
a5fce4b6ed
Merge remote-tracking branch 'upstream/master' into robotic-limbs-PT2
2020-10-11 15:39:41 +02:00
face07f532
Update supermatter.dm
2020-10-11 00:45:01 -07:00
8be9e0aaad
Merge pull request #13530 from Citadel-Station-13/silicons-patch-12
...
THROWING A CLOWN INTO THE SUPERMATTER ENGINE NOW RANDOMLY ADJUSTS ENERGY AND DAMAGE
2020-10-11 18:43:49 +13:00
b2336f1140
Merge pull request #13527 from ArchieBeepBoop/rtg
...
Fully Upgraded Advanced RTG Machine Preset
2020-10-10 22:01:20 -07:00
4ccf40f775
Revert "Revert "Merge branch 'master' into robotic-limbs-PT2""
...
This reverts commit 27a099c6bf
2020-10-11 00:53:18 +02:00
27a099c6bf
Revert "Merge branch 'master' into robotic-limbs-PT2"
...
This reverts commit 73b52674252e780bfff2
2020-10-11 00:51:39 +02:00
73b5267425
Merge branch 'master' into robotic-limbs-PT2
2020-10-11 00:44:28 +02:00
19f1e99a8c
mass ports like 15 tg prs + counting ( #13386 )
...
* changes
* ok
* changes
* sigh
* fixes
* changes
* fix
* fix
* alright
* fixes
git pus
* fix
* fix
* fix
* test
* ok
* Update code/modules/paperwork/ticketmachine.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
* ok
* compile and other stuff
* ok
* fix
* fix
* Fix
* Update menu.dm
* Update view.dm
* Update preferences.dm
Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com >
Co-authored-by: Putnam3145 <putnam3145@gmail.com >
2020-10-10 12:20:33 +02:00
LetterN