cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,984 Commits 73 Branches 18 Tags
eea0279bfea41ecbe20ede6bf79c6c05de59eba1
Commit Graph

23903 Commits

Author SHA1 Message Date
9600bauds
9f8178772f Holding a flashbang while it goes off voids your flashbang protection (#12724) 
* Holding a flashbang while it goes off voids your flashbang protection

* putting the flashbang in your backpack doesn't save you
 2016-12-21 09:15:45 -05:00
Sprok0
b3a3517bc0 round end spell display (#12776) 2016-12-21 09:09:50 -05:00
9600bauds
cec096054f Fixes cloner sanity (#12766) 2016-12-21 08:58:37 -05:00
9600bauds
90839ea142 Adds (preloaded) boot knife holsters to Mining vending machines (#12748) 
* Adds (preloaded) boot knife holsters to Mining vending machines

* Fucking sweet skinning knives

* dmi confrictu

* adds a spriting equivalent of shitposting
 2016-12-21 08:51:49 -05:00
JMWTurner
5bb1e1112f 64x64 AME Blob (#12751) 
* ameblob

* improved ame strong blob sprite
 2016-12-21 08:47:29 -05:00
Intigracy
184e9e2d87 adjusts some shitcode I did (#12975) 2016-12-21 08:43:35 -05:00
Intigracy
500346fa71 tajaran monkeys now speak mouse (#12976) 
just like daddy catbeast
 2016-12-21 08:42:48 -05:00
Pieter-Jan Briers
c0cdf351b2 More christmas stuff. (#12980) 
* LIGHTS

* Ginger bread man grammar.

* Deff has more snow.
 2016-12-21 05:02:27 -08:00
ultraplen
b52c4fee1e E-Gun, sounds for toggling firemodes. (#12817) 2016-12-21 07:22:24 -05:00
9600bauds
bacedc1818 Sharpness flags (#12728) 
* Sharpness flags

* Sharpness flag implementation

* We don't need this anymore!

* pretty

* Ow The Commit Message
 2016-12-21 07:19:37 -05:00
9600bauds
c1a9051158 Buckets hold 150u, don't fit in machinery (#12733) 
* Buckets hold 150u, don't fit in machinery

* Update biogenerator.dm
 2016-12-21 06:18:17 -05:00
Shadowmech88
0bca9f90be Christmas Cake (#12979) 
* Changes fruitcake sprite to be an actual fruitcake.
Adds Christmas cake, using what was previously the fruitcake sprite.
Microwaving a gingerbread man cookie with a grey slime core spawns a living gingerbread man.

* Re-changing name.

* Living gingerbread men can now be butchered for gingerbread man cookies.
 2016-12-21 06:07:18 -05:00
Probe1
ccb6c81a0c Re-adds ingredient to cookies. SORRY. (#12978) 
* Re-adds ingredient to cookies.  SORRY.

* name change for fruit cake
 2016-12-21 02:35:24 -08:00
unid15
554d34b814 Map element stuff (#12909) 2016-12-21 04:57:27 -05:00
Shadowmech88
f8168a94ed Gilded Bike Horn (#12854) 
* Adds sound files for gilded horn.

* Adds gilded bike horn.
 2016-12-21 04:35:41 -05:00
Sprok0
17b7670327 diona name weirdness (#12970) 2016-12-21 00:36:20 -08:00
9600bauds
75a2ca661a Autobackup for Genetics colored SE tabs (#12770) 
* Autobackup for Genetics colored SE tabs

* supr quality!!

* Conflict Message:

* aaah
 2016-12-21 02:06:28 -05:00
Intigracy
0fd2b4b1db fixes celt's untested and unreviewed code (#12972) 2016-12-20 21:34:33 -08:00
Probe1
765724ffbf Clarity for hivebot sizes. (#12964) 
* Clarity for hivebot sizes.

* Update hivebot.dm

* Update hivebot.dm

Find something wrong with this I dare you.  Lets make this 3 lines changed in 4 commits.
 2016-12-20 17:12:03 -08:00
Probe1
f0809c57ce rim bounce grammar (#12966) 2016-12-20 17:11:30 -08:00
Probe1
e3390dd6a9 blank shell name fix. (#12967) 2016-12-20 17:10:00 -08:00
Shadowmech88
eae088713c Grues (#12848) 
* Adds grues.
Adds swallow light spell.
Adds support to spell code for gradual-drain spells.
Adds racial spell spellmaster.

* Added sprites for grues.
Made a general /spell/racial path.

* Grues can now heal by consuming human meat.

* Removes unnecessary hulk underlay code.

* Adds a spell that allows grues to shatter lights.
/mob/living now has a var that holds a list of the tools that have been used to butcher it.
Autopsy scanners will now report what tools a human has been butchered with if the human's chest is scanned.
Being butchered by a grue, regardless of the tool used, will cause the autopsy scanner to report that the patient was eaten by a grue.

* Fixes conflicts.

* Puts map back to Boxstation.

* Addresses concerns.
 2016-12-20 16:45:45 -08:00
Probe1
03a8a6e818 Absolute pathing (#12959) 
* Surprise in the bar

* More special surprise stuff

* More surprises

* Saving progress on metaclub

* Metaclub special stuff

* Deff.

* Fix hat

* more secret stuff

* special stuff here!

* Special Streamers

* special box station

* special stuff

* removes some stuff

* 1/4th done with redoing it

* should probably include this!

* dir test

* special stuff done on box

* Special stuff for metaclub

* adds surprise food

* special stuff

* surprise stuff here

* surprise stuff

* changelog

* conflict resolved

* replaces our dmi with vgs to test

* this ought to fix those pesky dmi conflicts
 2016-12-20 18:39:54 +01:00
Jeroen
54a5e1cb18 Before: The Pun Pun lets out a faint chimper as it collapses and stops moving... (#12932) 
`The monkey (172)  lets out a faint chimper as it collapses and stops moving... `

After: 	`Pun Pun  lets out a faint chimper as it collapses and stops moving... `
	`The monkey (172)  lets out a faint chimper as it collapses and stops moving... `
 2016-12-20 13:29:16 +01:00
DrCelt
e03bec5c3b Fixes #10314, Vox Raider suits now have welding protection, as well as Vox security hardsuits (#12953) 2016-12-20 10:59:27 +01:00
DrCelt
710e278c84 Fixes something (#12951) 2016-12-20 10:57:54 +01:00
DrCelt
13f2173ba5 Fixes #11093, simple animal attacks are now properly logged (#12949) 2016-12-20 10:51:47 +01:00
DrCelt
546d415cc6 Fixes #11122 (#12948) 
Fixes #11122
 2016-12-20 10:50:52 +01:00
DrCelt
61dd433c52 Fixes #3469 (#12946) 
Fixes #3469
I tried to do the oldest bug ever to fix it but they were all like way too much effort tbh
 2016-12-20 10:49:09 +01:00
DrCelt
aec743217b Fixes #11848 (#12945) 
Fixes #11848
Thanks Cluster
https://github.com/d3athrow/vgstation13/pull/11469/files#diff-91658b0f29e816d448e0385be1a82620L38
 2016-12-20 10:48:17 +01:00
DrCelt
6e3ef0119c Fixes #12308 & Fixes #12178 (#12944) 
Fixes #12308 & Fixes #12178
 2016-12-20 10:47:52 +01:00
DrCelt
a98c0b9261 Fixes #12290 (#12943) 
Fixes #12290
 2016-12-20 10:46:55 +01:00
DrCelt
64bde63592 Fixes #12631 (#12940) 
Fixes #12631
Yes, I considered making this an istype - but that wouldn't work because of the way the icon code works
 2016-12-20 10:43:24 +01:00
DrCelt
ecb324497c Fixes #12716 (#12939) 
Fixes #12716
 2016-12-20 10:42:58 +01:00
DrCelt
ef32aa649f Fixes #12915 (#12938) 
Fixes #12915
Adds giant eclair
 2016-12-20 10:41:42 +01:00
DrCelt
48d2292a37 Fixes #12422 (#12937) 2016-12-20 10:40:36 +01:00
DrCelt
2ac7bc2fb8 Fixes #12920 (#12936) 
Fixes #12920
 2016-12-20 10:39:13 +01:00
DrCelt
ed98adae1e Fixes #10725 (#12935) 
Fixes #10725
 2016-12-20 10:38:39 +01:00
DrCelt
ece1fb5042 Fixes MoMMIs nullspacing their hat on death (fixes #8142) (#12893) 
* Fixes MoMMIs nullspacing their hat on death (fixes #8142)

* AAAAAAAAAAH
 2016-12-20 10:38:16 +01:00
DrCelt
61a9435efb HUDs work for monkeys(fixes part of #7025) (#12822) 
* HUDs work for monkeys(fixes part of #7025)

* \
 2016-12-20 10:37:51 +01:00
DrCelt
04b524041b Fixes methylin monkeys/fed diona nymphs not being able to read (#12824) 2016-12-20 10:37:39 +01:00
DrCelt
ba6cc42949 Fixes #7155, water can't put out campfires (#12820) 2016-12-20 01:45:46 -05:00
D3athrow
36a3c03745 Possibly fix #12865 2016-12-20 00:14:27 -06:00
9600bauds
018637bdb4 Plant analyzer rounding (#12735) 2016-12-19 21:56:09 +02:00
9600bauds
7abb46f92a Satisfies my morbid autism (#12767) 2016-12-19 21:55:29 +02:00
9600bauds
edf8fbbc61 Fixes #12922 (#12923) 2016-12-19 04:31:17 +02:00
Wizardcrying
70c4f09ee9 delete france 2016-12-18 14:34:38 -08:00
DrCelt
1cca8e3cec Fixes #7924, trying to fix mechanical internal organs with the wrong tools now gives a descriptive error message. (#12897) 
* Fixes #7924, trying to fix mechanical internal organs with the wrong tools now gives an actual error message.

* has_descriptive_commit_message
 2016-12-18 20:27:02 +01:00
DrCelt
9ec7abcbeb Fixes #7574, disposals piping construction issues (#12892) 
* Fixes #7574, disposals piping construction issues

* Commit Message:

* better
 2016-12-18 19:13:49 +01:00
JMWTurner
b7c4e1b7f5 Last holochips: Vox Raiders and Elite Syndicate Strike Team (#12739) 
* lastchips

* bok

* revision 1

* revision 2

* revision 3
 2016-12-18 18:29:30 +01:00