Ghom
103dbe18b3
Update vote.dm
2020-03-10 22:24:27 +01:00
keronshb
0f14fbfdac
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into BlobRefactor
...
To fixs something?
2020-03-08 17:51:17 -04:00
Ghom
57db0e0320
Merge pull request #11383 from Putnam3145/fix-storyteller-weights
...
Gives storyteller weights defaults properly (whoops)
2020-03-08 07:18:09 +01:00
Putnam
dfa7637f1b
fixes storyteller weights
2020-03-07 22:09:20 -08:00
keronshb
228012c718
Blob refactor ( #43872 )
...
Ports over Blob Refactor from TG
2020-03-06 15:58:17 -05:00
kevinz000
5ebf8ef1e3
Merge pull request #11316 from Citadel-Station-13/Ghommie-patch-3
...
Makes cargo passive point generation 125 a minute and not 2 or so every tick.
2020-03-06 00:19:26 -07:00
kevinz000
16d6ba9e21
Merge pull request #11323 from Ghommie/Ghommie-cit600
...
Porting a couple material datums code updates and fixes.
2020-03-06 00:17:21 -07:00
kevinz000
9420424c8f
Merge pull request #11332 from Ghommie/Ghommie-cit603
...
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-06 00:14:13 -07:00
Ghommie
bb7bfc04cc
Replaces EXCEPTION() with stack_trace() and CRASH()
2020-03-05 01:47:04 +01:00
Ghom
d78cdb9b37
Merge pull request #11130 from BlackMajor/SpaceRuins
...
Enables space ruin generation in the station z-level. Adds new ruins for the sake of station ruins.
2020-03-04 23:46:10 +01:00
Ghommie
60c7268e37
Also fixing bloodsucker coffins.
2020-03-04 16:29:09 +01:00
Ghommie
f2c8a7cd6f
Porting a couple material datums code updates and fixes.
2020-03-04 15:59:46 +01:00
Ghom
d318525078
Update shuttle.dm
2020-03-03 15:43:10 +01:00
Ghom
b7dda0080d
Fixes cargo passive point gen (ergo making it 125 a minute and not 1000+)
2020-03-03 15:40:53 +01:00
kevinz000
81f84f1bd1
Update garbage.dm
2020-03-02 18:18:44 -07:00
Ghom
fca911b74f
Merge pull request #11281 from Ragolution/master
...
Just another round-end sound.
2020-03-02 16:17:37 +01:00
Ragolution
49bff8e649
Update ticker.dm
...
Minor typo
2020-02-29 01:15:16 -05:00
Ragolution
763fee141d
Adds new audio file to defines in ticker for round-end sounds.
...
hello ticker my old friend
ive come to fuck with you again
the memes to my mind, slowly creeping
shitposts when i should probably be sleeping
and the question
that was planted in my brain
still remains
why the fuck is this in the /ticker/
2020-02-29 01:11:20 -05:00
kevinz000
4b9dfdf476
types
2020-02-28 13:24:39 -07:00
Artur
f8469c89a4
Conflict fix
2020-02-25 10:46:20 +02:00
BlackMajor
fc85f62546
Merge branch 'master' into SpaceRuins
2020-02-25 16:51:39 +13:00
Ghom
9355e9319b
Merge pull request #11110 from Hatterhat/hyper-96-aus-unk
...
you kids like extend votes?
2020-02-24 16:39:16 +01:00
BlackMajor
6624155e3d
Hey you know this is probably a smarter way to go about ruin spawning in station space.
2020-02-25 02:21:28 +13:00
BlackMajor
ca6341aac4
Merge branch 'master' into SpaceRuins
2020-02-24 19:47:52 +13:00
Hatterhat
19ae30ea5b
alright ghom i hope this works
...
Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-02-23 21:20:57 -06:00
Hatterhat
b89a2314a2
mmm that's compiling i don't like that
2020-02-22 16:17:51 -06:00
Ghommie
8fbfd07692
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229
2020-02-22 00:55:32 +01:00
Hatterhat
6dbd58b5df
i really fucked this up please advise
2020-02-21 16:07:41 -06:00
Hatterhat
07222cfd9a
*snap
2020-02-20 22:21:25 -06:00
Putnam
9f9881b57e
this is so sad
2020-02-20 18:43:36 -08:00
Putnam
a49260e0ac
Revert "maybe this'll work."
...
This reverts commit 8d00f11fc1
2020-02-20 16:03:00 -08:00
Putnam
8d00f11fc1
maybe this'll work.
2020-02-20 16:01:06 -08:00
Artur
5d76d33683
Merge remote-tracking branch 'Upstream/master' into Solar_updates
2020-02-20 13:15:46 +02:00
Putnam
00618dbc9b
whoops option is a number
2020-02-19 20:58:06 -08:00
Hatterhat
362ebbcf8f
shit
2020-02-19 21:14:13 -06:00
Hatterhat
0ad49f9004
shit dude i hope this works lmao
2020-02-19 17:18:51 -06:00
Putnam
dd3520896a
wow there's an else
2020-02-19 11:45:37 -08:00
Putnam
6aec971b4e
haha i'm dumb
2020-02-18 21:41:00 -08:00
BlackMajor
aff71e7f14
Initial Commit. Adds space ruins to station z.
2020-02-17 23:44:06 +13:00
Hatterhat
f05a88d36f
it compiles now ghom
2020-02-16 02:24:41 -06:00
Hatterhat
c00f797a4a
extendies
2020-02-16 01:26:33 -06:00
kevinz000
7ee04aa608
Merge pull request #10998 from Ghommie/Ghommie-cit569
...
Something about the in operator and spaceDMM version update.
2020-02-15 12:17:37 -07:00
kevinz000
56545d742d
Merge pull request #10923 from Citadel-Station-13/Ghommie-patch-7
...
Nerfing cargo passive points generation
2020-02-15 12:15:31 -07:00
Ghom
a4a9701c98
Merge pull request #11022 from kevinz000/ssprofiler
...
ports auto profiler subsystem from tg
2020-02-13 15:06:27 +01:00
Ghom
7198637463
Merge pull request #11038 from Citadel-Station-13/kevinz000-patch-7
...
STOP_PROCESSING now also removes from currentrun
2020-02-13 15:05:51 +01:00
kevinz000
4345f01322
Merge pull request #11021 from Ghommie/Ghommie-cit571
...
Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.
2020-02-13 04:11:01 -07:00
kevinz000
d8d6a8efb8
lazy-be-gone
2020-02-12 02:15:56 -07:00
Putnam
7795e1609d
why did i do that
2020-02-11 15:32:43 -08:00
kevinz000
3848da5b6b
mso
2020-02-11 07:55:00 -07:00
kevinz000
275fb6fc41
auto profiler
2020-02-11 07:54:17 -07:00
