3369c804b2
Kills off /obj/item/device ( #6561 )
2018-04-30 00:06:58 -05:00
a4bc2c0b95
Merge pull request #6500 from Citadel-Station-13/upstream-merge-37398
...
[MIRROR] Fixes cargo scanner being invis.
2018-04-27 00:09:17 -05:00
a88caf87aa
Fixes cargo scanner being invis.
2018-04-23 18:28:41 -05:00
5518efebea
everything but mob stuff
2018-04-23 01:06:17 -05:00
846aa734e8
fixes fuckup in expressconsole preventing packs being ordered when credits are low ( #37239 )
...
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089 )
* fixes my errors
2018-04-16 19:14:08 -05:00
1f9d19a92a
Merge pull request #6349 from Citadel-Station-13/upstream-merge-36983
...
[MIRROR] Provides more control over uplink surplus chances.
2018-04-11 21:34:56 +00:00
04f7fc5788
adds tesla coil crate
2018-04-11 14:57:30 -05:00
43e0079981
Provides more control over uplink surplus chances. ( #36983 )
...
Cant wait for the epic balance prs that people will fight in
2018-04-11 05:16:32 -05:00
f7be23e78a
Merge branch 'master' into upstream-merge-36442
2018-04-01 19:50:37 -05:00
efb3dceb32
Fixes the cargo Express Console's description [wtf why is there a sprites tag] ( #36765 )
...
* - Introduces a non-linear component to liver damage from alcohol so weak alcohol doesn't kill you instantly. (#36089 )
* mfw the space jews finally leave the drop pod buisiness
gimme gimme the gee bee pee
the fuck ahaha
2018-03-28 13:38:04 -05:00
2d8b007086
Refactors Spell and Martial Art Books to use Action Granters!
2018-03-28 12:18:06 -05:00
544d7bcaf4
[MIRROR] Adds descriptions to all cargo orders! ( #5917 )
...
* Adds descriptions to all cargo orders!
* recompiles tgui
2018-03-12 07:39:38 -05:00
455ee7e687
modules
2018-03-06 21:45:16 -06:00
69405b9561
[MIRROR] Allows admins to easily spawn cargo crates ( #5786 )
...
* makes cargo spawning easy (#36094 )
* Allows admins to easily spawn cargo crates
2018-03-04 07:45:18 -06:00
b198e943e9
[MIRROR] Rearranges cargo packs ( #5750 )
...
* Rearranges cargo packs
* update packs.dm
2018-03-02 20:06:35 -06:00
4f983ae337
[MIRROR] Crab Rockets ( #5719 )
...
* Crab Rockets
* fixes mirror bot's shit
* ...github wtf
2018-02-27 05:28:17 -06:00
dac26732e2
Update packs.dm
2018-02-18 18:32:00 -05:00
e975cd3629
Fixes bicycle riding
2018-02-18 11:34:21 -06:00
be212dd736
Update packs.dm
2018-02-07 14:09:28 -05:00
cf66c8c79c
Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates
2018-02-07 04:52:27 -06:00
7126b61205
[MIRROR] Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag ( #5327 )
...
* Return of ore stacking, various changes to lavaland bombs to facilitate reduced lag
* really? Like, a dozen fucking map conflicts. this map was fucked entirely
2018-02-06 19:06:31 -06:00
b6c4bd6e01
[MIRROR] Fixes bloodpack sprite issues ( #5333 )
...
* Fixes bloodpack sprite issues
* Update packs.dm
* fuck this godamn map
2018-02-06 18:24:51 -06:00
e16db54c67
[MIRROR] Bartender Drink Sliding: Intrinsic to Extrinsic ( #5297 )
...
* Bartender Drink Sliding: Intrinsic to Extrinsic
* Update packs.dm
2018-02-05 04:42:13 -06:00
43ee34838f
[MIRROR] Adds pineapples to botany, and Hawaiian pizza ( #5260 )
...
* Adds pineapples to botany, and Hawaiian pizza
* Update packs.dm
2018-02-05 03:00:22 -06:00
cc2d5bfc07
[MIRROR] Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs ( #5283 )
...
* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs (#35249 )
* yaga
* node change
* okay cobby
* Fixes attackby in expressconsole.dm, moves bluespace pod upgrade further down the line in techwebs
2018-02-04 23:18:18 -06:00
d7659ac6b2
sync with master
2018-01-31 07:02:55 -06:00
9a24afb8a4
Merge pull request #5164 from Citadel-Station-13/upstream-merge-34950
...
[MIRROR] Readds bz canisters to cargo order packs
2018-01-31 03:02:31 -06:00
e292b050f8
bye
2018-01-30 22:44:21 -06:00
03086dfa91
Tg 1 28 sync testing/confirmation ( #5178 )
...
* maps, tgui, tools
* defines and helpers
* onclick and controllers
* datums
fucking caught that hulk reversal too.
* game and shuttle modular
* module/admin
* oh god they fucking moved antag shit again
* haaaaate. Haaaaaaaaaate.
* enables moff wings
* more modules things
* tgstation.dme
before I forget something important
* some mob stuff
* s'more mob/living stuff
* some carbon stuff
* ayy lmaos and kitchen meat
* Human stuff
* species things
moff wings have a 'none' version too
* the rest of the module stuff.
* some strings
* misc
* mob icons
* some other icons.
* It compiles FUCK BORERS
FUCK BORERS
2018-01-29 04:42:29 -06:00
124f68bf87
Readds bz canisters to cargo order packs ( #34950 )
...
* Update packs.dm
* Update packs.dm
2018-01-28 18:39:07 -06:00
888a132eff
Update expressconsole.dm
2018-01-23 08:19:16 -06:00
8e090b430b
Adds the Bluespace Drop Pod upgrade to the cargo express console
2018-01-23 01:36:43 -06:00
dcd61e0ba4
The Express Console emag effect is now a proper emag effect ( #34373 )
...
* The Express Console emag effect is now a proper emag effect
cyka blyat
* Update expressconsole.dm
* Update expressconsole.dm
* Update expressconsole.dm
* Update expressconsole.dm
* Update expressconsole.dm
* Update expressconsole.dm
* Update expressconsole.dm
* Update expressconsole.dm
2018-01-14 23:48:55 -06:00
1f88c0c660
[READY]Cargo Update: Nanotrasen Supply Drop Pods!
2018-01-10 03:12:07 -06:00
0dbc2241ea
modules: A to C
2018-01-04 00:46:53 -05:00
f875d4e176
Defines math, take 2
2017-12-17 10:02:43 -06:00
7af461539f
Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"
2017-12-16 13:08:50 -06:00
253c819bc1
TG Sync 12/15/17
...
s
s
2017-12-15 06:27:57 -08:00
da0ecad1ee
Update order.dm
2017-12-13 16:47:00 -05:00
7f90427a40
Replaces a bunch of loc assignments with forcemoves and moves to nullspace
2017-12-13 13:56:57 -06:00
cc0b768c72
[MIRROR] [READY] RND TECHWEBS + DEPARTMENTAL LATHES ( #4014 )
...
* [READY] RND TECHWEBS + DEPARTMENTAL LATHES
* resetting all the maps because we can worry about them later.
* Regexing
* I'm fucked
* Fixes
* .
* maps
* bleh
* ree
* fixes
2017-12-11 16:36:38 -08:00
f3fd81af24
Adds games vendor resupply crate
2017-12-06 22:53:21 -06:00
66c66f0bd7
[READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on
2017-12-03 15:33:29 -06:00
b9f42c299b
Merge pull request #4152 from Citadel-Station-13/upstream-merge-33134
...
[MIRROR] Removes "machine prototypes"
2017-11-30 04:46:25 +00:00
48c66093fc
Fixes big band music crate ( #33138 )
2017-11-28 19:02:54 -06:00
0ad637388f
Removes "machine prototypes"
2017-11-28 06:28:15 -06:00
eba36e48f9
Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
...
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
0f9a85e4d7
Merge pull request #3747 from Citadel-Station-13/upstream-merge-32101
...
[MIRROR] Refactor of catpeople mutant organs
2017-11-21 21:16:31 +00:00
b7e99a7448
JSON feedback
2017-11-17 01:44:12 -06:00
43113cd9b5
Merge pull request #31947 from AnturK/yarr
...
How does this work:
Station receives a communication extorting current cargo point, if they answer yes the points are just gone and nothing of interest happens.
If station refuses to pay or is silent for 3 minutes, pirate shuttle spawns somewhere in space.
There's an internal GPS onboard so crew will always be able to follow the shuttle.
Crew of 3, moderately armed. (Balance pending)
Shuttle engines have 3 minute cooldown between jumps.
Special shuttle equipment will block cargo and emergency shuttles from leaving and slowly steal the points.
2017-11-13 03:19:38 -06:00
kevinz000