Commit Graph

16048 Commits

Author SHA1 Message Date
lolman360
9931cb006c eee 2020-08-18 17:33:20 +10:00
lolman360
d8e286d7be ee 2020-08-18 16:17:00 +10:00
lolman360
325f4eb72e Updates 2 2020-08-18 15:43:44 +10:00
lolman360
f2a86f2c42 Update medical_designs.dm 2020-08-18 14:23:09 +10:00
lolman360
8356dbf20a Update medical_designs.dm 2020-08-18 13:26:32 +10:00
lolman360
32c0335a17 Update medical_designs.dm 2020-08-18 10:35:56 +10:00
lolman360
2f14d8998b Update autohydro.dm 2020-08-17 22:42:41 +10:00
lolman360
6f7badda41 Merge branch 'master' into plumb 2020-08-12 09:03:11 +10:00
silicons
775fa046eb you can now use any typepath as an emoji :/obj/item/clothing/mask/joy: (#12808)
* Update emoji_parse.dm

* Update emoji_parse.dm
2020-08-11 14:17:35 +02:00
silicons
a8d61b60ef Merge pull request #13011 from timothyteakettle/insane-shot-eyepatch
adds a cybernetic eyepatch to the syndicate uplink
2020-08-11 01:47:32 -07:00
silicons
cf209939ea Merge pull request #13070 from kappa-sama/patch-40
lowers price of 2 borderline useless uplink items
2020-08-11 01:44:40 -07:00
silicons
b16f920479 Merge pull request #13086 from ArchieBeepBoop/dev
Add Skulldog Snout
2020-08-11 01:44:29 -07:00
silicons
e7d7b991d9 Merge pull request #13107 from DeltaFire15/warcrime-gun-armory-lock
The warcrime gun belongs in the armory
2020-08-11 01:44:07 -07:00
silicons
2d01c4db5b Merge pull request #13106 from zeroisthebiggay/cesuitgoclick
ce hardsuit no longer requires a jumpsuit to actually be fully radproof
2020-08-11 01:43:54 -07:00
silicons
16a556b367 Merge pull request #13101 from Detective-Google/funny
spelling
2020-08-11 01:43:35 -07:00
silicons
df05c5ee4d Merge pull request #13089 from Putnam3145/fix-sprite-display
Demodularization + making certain sprite overlays less hilariously jank
2020-08-11 01:43:21 -07:00
silicons
c1d8d1d439 Merge pull request #13090 from lolzalolka/lean
Added Burek to Space
2020-08-11 01:42:58 -07:00
silicons
5694923d89 Merge pull request #13095 from lolman360/liver
custom name/desc ring and necklace
2020-08-11 01:41:48 -07:00
silicons
035422ed7f Merge pull request #13098 from LetterN/ToS-component
Mafia Component
2020-08-11 01:41:13 -07:00
lolman360
f10053fe96 suture 2020-08-11 18:03:59 +10:00
lolman360
c699729250 lint 2020-08-11 17:53:51 +10:00
lolman360
6e2bb79834 Update medipenrefill.dm 2020-08-11 17:32:44 +10:00
lolman360
f977ac7180 e e e ee ee 2020-08-11 17:08:21 +10:00
lolman360
c18f0defd8 medi8el 2020-08-11 16:44:08 +10:00
Letter N
7008dac8dd what if the maps aren't causing runtims 2020-08-11 11:49:25 +08:00
DeltaFire
0f27a89e5d yeah this belongs into the armory
Hellgun single pack
goodies > armory
2020-08-10 18:41:56 +02:00
zerothebigboy
9baedbd904 a 2020-08-10 10:08:25 -04:00
zerothebigboy
cf75f7d4b6 a 2020-08-10 10:08:15 -04:00
Letter N
afe53992b5 miniump of 5, max of 12 2020-08-10 17:47:33 +08:00
silicons
3795bcf2d0 Merge pull request #13097 from zeroisthebiggay/yessalthairpr
Patented Zero Salt PR That Adds One New Hair Style That Is Just Pompadourless Volaju Because
2020-08-10 02:29:47 -07:00
Letter N
c70f1510e6 fairly sure mmo mafia is not a thing and i'm lazy 2020-08-10 16:00:38 +08:00
Letter N
ec57c24a71 endgame 2020-08-10 13:10:40 +08:00
Letter N
a4040ace26 hewwo have you tried to work? 2020-08-10 10:50:07 +08:00
lolman360
c160d73265 ee 2020-08-10 10:40:30 +10:00
lolman360
900b0b068a linter take 3
love u putnam
2020-08-10 10:38:53 +10:00
lolman360
d9c198825b linter 2: 2020-08-10 10:29:17 +10:00
lolman360
6c4c3e4255 lint! 2020-08-10 09:47:55 +10:00
lolman360
a44afad849 Update autohydro.dm 2020-08-10 08:26:06 +10:00
Detective Google
bbe32ab412 lmao 2020-08-09 16:36:58 -05:00
chrisbbbbbbb
e8ac70696f new food idk? 2020-08-09 18:58:32 +02:00
ArchieBeepBoop
950c8fb8be Merge pull request #2 from ArchieBeepBoop/master
Update Dev Branch
2020-08-09 13:23:25 -03:00
silicons
4da1d0b73c Update human_defense.dm (#13002) 2020-08-09 16:06:53 +02:00
Winter Flare
76293ee032 My balls are raw. Meatballs, that is. (#13075)
* Food Processor produces Raw Meatball

* No nutrition loss from slabs.
2020-08-09 16:01:52 +02:00
silicons
07e2423c22 regarding malf ais, apcs, space, and engineering cyborg grippers (#12933)
* Update areas.dm

* Update apc.dm

* Update apc.dm
2020-08-09 15:57:53 +02:00
lolman360
cbe783023d Update autohydro.dm 2020-08-09 23:55:06 +10:00
lolman360
6c57dce54e WX 2020-08-09 23:52:21 +10:00
silicons
5abab38613 increases space levels to 4 (#13022)
* Update map_config.dm

* Update code/modules/mapping/map_config.dm

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>

Co-authored-by: Trilbyspaceclone <30435998+Trilbyspaceclone@users.noreply.github.com>
2020-08-09 15:41:58 +02:00
Letter N
2f1b769ae4 lazyfix 2020-08-09 21:38:42 +08:00
Letter N
bfba7307ec fix 2020-08-09 21:29:08 +08:00
Seris02
635a42e102 yeet (#11699) 2020-08-09 15:14:25 +02:00