Commit Graph

121 Commits

Author SHA1 Message Date
deathride58
be212dd736 Update packs.dm 2018-02-07 14:09:28 -05:00
Ashe Higgs
cf66c8c79c Adds anomalous, infinitely-regenerating pizza boxes as a very rare item from pizza crates 2018-02-07 04:52:27 -06:00
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
CitadelStationBot
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
Poojawa
d7659ac6b2 sync with master 2018-01-31 07:02:55 -06:00
LetterJay
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
Liam
e292b050f8 bye 2018-01-30 22:44:21 -06:00
Poojawa
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
Nick
124f68bf87 Readds bz canisters to cargo order packs (#34950)
* Update packs.dm

* Update packs.dm
2018-01-28 18:39:07 -06:00
LetterJay
888a132eff Update expressconsole.dm 2018-01-23 08:19:16 -06:00
MrDoomBringer
8e090b430b Adds the Bluespace Drop Pod upgrade to the cargo express console 2018-01-23 01:36:43 -06:00
Iamgoofball
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
oranges
1f88c0c660 [READY]Cargo Update: Nanotrasen Supply Drop Pods! 2018-01-10 03:12:07 -06:00
deathride58
0dbc2241ea modules: A to C 2018-01-04 00:46:53 -05:00
Emmett Gaines
f875d4e176 Defines math, take 2 2017-12-17 10:02:43 -06:00
LetterJay
7af461539f Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC" 2017-12-16 13:08:50 -06:00
kevinz000
253c819bc1 TG Sync 12/15/17
s

s
2017-12-15 06:27:57 -08:00
deathride58
da0ecad1ee Update order.dm 2017-12-13 16:47:00 -05:00
vuonojenmustaturska
7f90427a40 Replaces a bunch of loc assignments with forcemoves and moves to nullspace 2017-12-13 13:56:57 -06:00
CitadelStationBot
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
Jordan Brown
f3fd81af24 Adds games vendor resupply crate 2017-12-06 22:53:21 -06:00
kevinz000
66c66f0bd7 [READY]VEHICLE REFACTOR - Riding datums --> Components, Vehicles --> /obj/vehicle, staging for mech overhaul later on 2017-12-03 15:33:29 -06:00
deathride58
b9f42c299b Merge pull request #4152 from Citadel-Station-13/upstream-merge-33134
[MIRROR] Removes "machine prototypes"
2017-11-30 04:46:25 +00:00
ShizCalev
48c66093fc Fixes big band music crate (#33138) 2017-11-28 19:02:54 -06:00
ACCount
0ad637388f Removes "machine prototypes" 2017-11-28 06:28:15 -06:00
LetterJay
eba36e48f9 Merge pull request #3984 from Citadel-Station-13/upstream-merge-32188
[MIRROR] JSON feedback
2017-11-22 18:42:34 -06:00
deathride58
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
Jordie
b7e99a7448 JSON feedback 2017-11-17 01:44:12 -06:00
oranges
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
Tad Hardesty
144df6c549 Fix a few syntactic aberrations (#32284) 2017-11-02 04:21:51 -05:00
ACCount
eb54055278 Refactor of catpeople mutant organs 2017-11-01 21:38:06 -05:00
as334
eb4f6326d7 Assmos part 1, #2 2017-10-26 23:12:27 -05:00
Tad Hardesty
01ecdff51a Improve extended examination text for many objects (#31381)
Plurality, capitalization, punctuation, and item icons have been
improved. Status displays now show the same text on examination that
they do visually. Inducers only show a success message when they
actually succeed.
2017-10-10 03:07:38 -05:00
CitadelStationBot
2c78f7122c [MIRROR] Adds some new plushies (#2866)
* Adds some new plushies

* Update packs.dm
2017-09-22 22:31:07 -05:00
CitadelStationBot
8ef3861b0b [MIRROR] New squeaky datum and plushes (#2847)
* New squeaky datum and plushes

* Update bananashoes.dm
2017-09-22 19:43:56 -05:00
CitadelStationBot
b13f090fe9 [MIRROR] Adds Lavaland items to weapon exports for cargo (#2836)
* Adds Lavaland items to weapon exports for cargo (#30403)

They're expensive, but those mobs are quite difficult to kill

* Adds Lavaland items to weapon exports for cargo
2017-09-17 22:32:53 -05:00
LetterJay
dac6cc56e4 Merge branch 'master' into upstream-merge-30494 2017-09-12 02:40:24 -05:00
LetterJay
01b0e754c2 Merge pull request #2679 from Citadel-Station-13/upstream-merge-30531
[MIRROR] Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter
2017-09-12 02:35:17 -05:00
kingofkosmos
63122795f9 Adds missing span-endings 2017-09-11 07:10:09 -05:00
Militaires
3aec72d4f4 Adds Gondoland and the rare Gondolas (#30530)
A strange race of bear-like beings consisting of a head placed DIRECTLY on a pair of legs, their fur sells for extremely high prices.

The gondoland asteroid is the last natural habitat for these rare creatures.
2017-09-10 17:10:45 -05:00
Kerbin-Fiber
d158ec9528 Adds Donksoft Toy Vendor (Machine Board) to the Circuit Imprinter 2017-09-10 03:43:09 -05:00
LetterJay
00199af27d Merge branch 'master' into upstream-merge-29866 2017-09-06 09:21:53 -05:00
Poojawa
7f46280d6b Update vg_clothing_packs.dm (#2591) 2017-09-04 04:47:20 -05:00
kevinz000
5f5065eb46 kek 2017-08-29 09:59:57 -07:00
LetterJay
6c76ae2395 clean up 2017-08-28 10:34:31 -05:00
LetterJay
188193eb61 here we go again (#2456) 2017-08-24 19:24:25 -07:00
kevinz000
35b7b93b24 ok this is going to be a pain in the ass ain't it (#2458)
lets hope nothing blows up this time (Flags PR but it works!)
2017-08-22 05:01:38 -07:00