Commit Graph

12 Commits

Author SHA1 Message Date
LetterJay
3d0f914a2c Merge pull request #6770 from Citadel-Station-13/upstream-merge-37869
[MIRROR] Adds Fernet, a digestif that reduces your satiety.
2018-05-19 09:15:46 -05:00
LetterJay
047fc2a858 Update boozeomat.dm 2018-05-17 23:45:11 -05:00
ThePainkiller
e2bcf82341 Adds Fernet, a digestif that reduces your satiety. 2018-05-17 10:19:40 -05:00
Dax Dupont
eb29d86c5f Fixes wrong circuits (#37853)
* Fixes wrong circuits

* this too
2018-05-16 12:04:54 -05:00
Jordan Brown
3b03fa3a37 Replaces loose tech storage boards with spawners 2018-05-14 15:18:17 -05:00
LetterJay
3ce9fba8bf Merge pull request #6611 from Citadel-Station-13/upstream-merge-37589
[MIRROR] Adds 5 new drinks
2018-05-13 11:52:12 -05:00
Firecage
694726e89d Replaces the Roman Shield and Roman Helmets in the autodrobe with fake versions with no block chance nor armour values. (#37683)
* removes the block chance from the Roman Shield.

* replaces the Roman Shield in the autodrobe with a toy version with no block chance.

* replaces the armoured roman helmets from the autodrobe with fake ones.
2018-05-09 00:49:19 -05:00
europax
2fe4591a12 Adds 5 new drinks 2018-05-01 13:42:48 -05:00
kevinz000
3369c804b2 Kills off /obj/item/device (#6561) 2018-04-30 00:06:58 -05:00
Poojawa
5518efebea everything but mob stuff 2018-04-23 01:06:17 -05:00
Poojawa
5fa001c10f things with stuff (#6233)
* buncha things from upstream

* datums globals, onclick

* datums

* game folder, holy shit mirror bot why

* modules

* icons

* dme

* compiles cleanly

* tools purge

* updates maps

* double check just because. and wew lad

* incidentally, this needs more work first

* some things

* weh

* sound cleanup and icons

* reeeee

* compile issues

* oh look, fresh code sync

* cleans up some unused icons

* dirty vars

* reeeeeeeeeeeeeeee

* wew lad. fuck off with this already
2018-04-07 23:07:09 -04:00
CitadelStationBot
bd3d76b8d3 [MIRROR] Modularises vending machines (#6050)
* Modularises vending machines

* Update vending_items.dm
2018-03-22 06:10:17 -05:00