cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 18:32:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
39,387 Commits 73 Branches 18 Tags
f66c4b2da12315af175e800d76c5bb2a72182e6a
Commit Graph

28722 Commits

Author SHA1 Message Date
otatoh
a71e0ab040 Adds spare trader IDs (#21605) 
* adds_extra_trader_ids

* fixes a thing
 2019-02-13 10:57:01 -03:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
985b172320 Janitor PDA also tracks janicarts (#21649) 2019-02-13 10:48:36 -03:00
MadmanMartian
069a048801 Can now forge mythril and telecrystal (#21666) 2019-02-13 10:48:00 -03:00
boy2mantwicethefam
a823b99dc2 Everything else + sprites 2019-02-13 15:44:16 +02:00
boy2mantwicethefam
d88384c196 Bluespace RPED (that was easy) 2019-02-13 14:51:37 +02:00
MadmanMartian
55054a0832 Fixes lonely robots BRICKING THE ENTIRE GAMESTART (#21679) 2019-02-13 08:50:25 -03:00
MadmanMartian
dd38146979 Merge pull request #21670 from DeityLink/20190213-IncenseForgot 
Forgot some incense flavor text stuff
 2019-02-13 09:02:03 +00:00
SonixApache
522212f942 remove debug 2019-02-13 02:22:32 +01:00
DeityLink
92ee323013 incense 2019-02-13 00:22:06 +01:00
MadmanMartian
bb1467c15c Merge pull request #21634 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/jj 
Introducing the NINJAMOP
 2019-02-12 22:41:07 +00:00
DeityLink
537b5ad2ad hearfix (#21667) 2019-02-12 19:21:50 -03:00
Kurfursten
8f6fb5bf00 Don't Enslave MoMMIs 2019-02-12 16:08:09 -06:00
MadmanMartian
4b5d2390cb Merge pull request #21635 from Allspice/truesight-cost 
Halve the cost of the major truesight potion.
 2019-02-12 21:57:07 +00:00
MadmanMartian
200cf96d6a Merge pull request #21659 from SirSkeleto/Bleeding-Edge 
Update vending.dm
 2019-02-12 21:56:42 +00:00
MadmanMartian
ec660cfffb Merge pull request #21644 from Kurfursten/syncstart 
Sync Borgs At Roundstart (SBO46)
 2019-02-12 21:56:29 +00:00
MadmanMartian
a9109c2f5d Merge pull request #21641 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/cccccccccccccccccc 
Removes credits debugging
 2019-02-12 21:55:50 +00:00
Kurfursten
6da34df3b6 Loose Catbeast Miniantag (#21554) 
* loose catbeast miniantag

* threat adjustments

* catbeast

* map swap

* make more obvious
 2019-02-12 18:50:56 -03:00
MadmanMartian
53baf80c78 Merge pull request #21506 from boy2mantwicethefam/fire-alarm 
Now you can ctrl-click fire alarms to toggle them on or off.
 2019-02-12 21:36:43 +00:00
MadmanMartian
7bfcb84662 Merge pull request #20298 from ShiftyRail/SyndieShoes 
Slip refactor
 2019-02-12 21:33:55 +00:00
MadmanMartian
45d4dcd444 Merge pull request #21508 from Gringonius/wineupdate 
Wines and grape juice
 2019-02-12 21:15:35 +00:00
Shifty/Anthomansland
c591909e04 No fun allowed 2019-02-12 22:13:02 +01:00
MadmanMartian
504a50dd88 Merge pull request #21497 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/bbbbbbb 
Wizard spell bundles cost 80 spellpoints, down from 100
 2019-02-12 21:12:54 +00:00
MadmanMartian
a7639e747c Merge pull request #21496 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/bbbbbb 
Syndie Bundles cost 14 TC, down from 20
 2019-02-12 21:12:22 +00:00
MadmanMartian
f5c553097e Merge pull request #21296 from ShiftyRail/ThePaper 
[OBS-5/51] Brings back THE PAPER ™️
 2019-02-12 20:54:21 +00:00
MadmanMartian
58bde1d038 Merge pull request #21642 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/bbbbbbbbb 
Repaths ciggybutts to /trash/
 2019-02-12 20:48:59 +00:00
MadmanMartian
8acdfec309 Merge pull request #21650 from I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE/ccccccccccccccccccc 
Folded notes fit in ciggypacks, coins fit in matchboxes
 2019-02-12 20:47:33 +00:00
MadmanMartian
1193ea2f13 Merge pull request #21560 from SonixApache/codervalids 
fix midround / latejoin injection
 2019-02-12 20:44:07 +00:00
MadmanMartian
b73e5e9b41 MoMMIs can now use the forge (#21662) 2019-02-12 16:23:07 -03:00
Kurfursten
8916f70cba Uplinks Get Dropped (#21639) 2019-02-12 16:03:06 -03:00
I_VAPE_VOX_CLOACA_EVERY_DAY_OF_MY_LIFE
9942a14618 Repaths ciggybutts to /trash/ 2019-02-12 14:36:21 -03:00
SirSkeleto
435786791a Update vending.dm 2019-02-12 12:15:30 -05:00
Kurfursten
41ddfa697b mind hotfix (#21658) 2019-02-12 10:25:55 -06:00
DeityLink
6f4cb1db54 Altar Cult Holomap (#21629) 
* holomarkers

* cult altar holomaps

* altar-here

* offstation
 2019-02-12 11:41:35 -03:00
Kurfursten
167d45a24b blob balance (#21550) 2019-02-12 11:32:31 -03:00
Kurfursten
81f85e5e71 Antagonists Refund Threat (#21505) 
* refund value

* reduce ragin mage

* refund for no app

* fix roidstation line endings

* fix roid conflicts again
 2019-02-12 11:28:58 -03:00
DeityLink
cb5882e602 The Chaplain Update, Part 1: The "Incense Update" (#21627) 
* incense stuff

* incense update

* better

* heh

* fix
 2019-02-12 10:22:37 -03:00
Kurfursten
9058d89f86 Midround Ops Forge Objectives (#21640) 2019-02-12 09:04:53 -03:00
ShiftyRail
1c59f9f055 You may NOT have my attention (#21651) 2019-02-12 08:40:20 -03:00
I_VAPE_VOX_CLOACA_EVERY_DAY_OF_MY_LIFE
f08caabaf0 hehehe 2019-02-11 17:29:44 -03:00
I_VAPE_VOX_CLOACA_EVERY_DAY_OF_MY_LIFE
595ee28f39 Matchboxes and ciggypacks can hold stuff 2019-02-11 17:05:17 -03:00
I_VAPE_VOX_CLOACA_EVERY_DAY_OF_MY_LIFE
486a80b237 EPISODE NAAMES 2019-02-11 15:49:43 -03:00
MadmanMartian
1e5125df98 Merge pull request #21648 from MadmanMartian/fixes_ambience 
Fixes ambience
 2019-02-11 17:45:00 +00:00
I_VAPE_VOX_CLOACA_EVERY_DAY_OF_MY_LIFE
1e104adc81 Probabilities 2019-02-11 14:41:30 -03:00
madmanmartian
557b1d2fd2 Fixes ambience 2019-02-11 17:32:41 +00:00
I-VAPE-VOX-CLOACA-EVERY-DAY-OF-MY-LIFE
e989020437 Trash bag can hold more, slows down if too stuffed (#21633) 2019-02-11 14:29:36 -03:00
Kurfursten
6a1ddee210 Sync Borgs At Roundstart 2019-02-11 09:43:31 -06:00
I_VAPE_VOX_CLOACA_EVERY_DAY_OF_MY_LIFE
d25ca02c89 Removes credits debugging 2019-02-11 11:49:47 -03:00
Pacmandevil
c5e14fd51e Ambience subsystem v2 - less shitty and gritty edition (#20856) 
* one two

* Update ambient_sound.dm

* fuck me

* Adds ambience datums. rearranges some shit.

* copy pastes a line of code from the diff

* I'm gay

* ok

ok
 2019-02-11 10:07:31 -03:00
MadmanMartian
14b3ea70a4 Merge pull request #21563 from boy2mantwicethefam/xrayfix 
Fixes mesons and night vision not changing vision when combined with x-rays.
 2019-02-11 12:14:51 +00:00
Allspice
b420e98532 Halve the cost of the major truesight potion. 2019-02-10 16:33:52 -08:00