f5ad5d711f
parens...
2022-07-29 00:19:57 -07:00
6b8a54fb57
i missed a bit
2022-07-29 00:19:24 -07:00
297e901db3
Fixes rad collectors to use correct units
2022-07-29 00:15:34 -07:00
2555843026
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 03:06:56 -03:00
fd286c325e
Merge branch 'master' into Projectile_Rework
2022-04-09 04:19:56 +00:00
695835fcd6
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload)
2022-04-09 00:03:13 -03:00
586a035132
Update files
2022-04-06 18:41:31 -03:00
189716314f
Would you like some defines in these trying times?
2022-03-23 12:10:02 -03:00
2fdb70b2b9
[DNM][DNM][WIP] Projectile backend code port and update
...
Ports#54924, #65061 , #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
ce6e8c99c6
fixes
2022-02-15 21:56:36 -07:00
8dcfea5817
Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch
2021-11-21 10:34:14 +08:00
6aa906395c
not a gaius reference
...
hhhh let me just replace all the ex_acts missing some args and adjust them
2021-11-14 21:34:59 +01:00
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
86177c51c4
auxgm part 1
...
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
2021-06-08 09:54:28 -07:00
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
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
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
cf2e70671a
upload files
2021-02-18 14:47:10 -03:00
2ec2f55eb7
updates fork
2021-02-17 12:03:28 -05: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
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
a808f805d4
ASYNC EVERYTHING!
2020-12-21 16:24:51 +08:00
a7fc05a1c7
Buffs rad collectors.
2020-11-24 06:43:17 -08:00
5b03f5b0ec
more
2020-11-12 23:36:18 -07: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
58737e42b9
empulse using range
2020-09-10 19:52:34 +01:00
e0f44ef717
new emps
2020-09-10 03:49:47 +01:00
b376a6b6c4
Merge remote-tracking branch 'origin/master' into TGUI-4
2020-07-30 14:43:52 +08:00
10fefca674
another batch. MAJOR: chem_master, pandemic
2020-07-30 14:06:20 +08:00
9ff94e019b
Merge pull request #12924 from SiliconMain/analyzer
...
Ports long range atmos analyzer from skyrat
2020-07-29 01:09:48 -07:00
bbffd41d55
Merge pull request #12883 from Citadel-Station-13/silicons-patch-49
...
beam rifles are now practical in emitters
2020-07-28 22:05:39 -05:00
abdafe15fa
fuck
2020-07-26 15:21:24 -05:00
aabe3c3b32
Update emitter.dm
2020-07-23 18:52:39 -07:00
286e5384d1
fix
2020-07-21 12:07:24 -07:00
98d3ac80d9
:pika:
2020-07-20 11:25:17 -07:00
58e26c540c
merge from master
2020-07-20 10:18:44 -07:00
55f8e37544
sigh
2020-07-18 20:26:11 -07:00
993b4ec222
Merge remote-tracking branch 'citadel/master' into unarmed_parry
2020-07-16 19:39:46 -07:00
5f9364c5f8
Merge remote-tracking branch 'Upstream/master' into TGUI-3.0
2020-07-13 16:20:54 +03:00
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
6ee63f66aa
whew
2020-07-07 20:48:54 -07:00
19f215477e
Merge remote-tracking branch 'upstream/master' into TGUI-3.0
2020-05-30 18:52:02 +03:00
ce1f1bdf5e
Turning a few components into elements. ( #12325 )
...
* Turning a few components into elements.
* eh
2020-05-24 13:06:27 -07:00
9d04b0835b
Conflicts galore
2020-05-21 21:08:12 +03:00
08280a853e
Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers' ( #12282 )
...
* Renames 'visible_atoms' and 'get_actual_viewers' procs to 'fov_view' and 'fov_viewers'
* Ok, signals.
2020-05-17 17:04:15 -07:00
Putnam3145