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
40,227 Commits 73 Branches 18 Tags
b9d51da9e3453d81b106fb1bdb59d1571801fc44
Commit Graph

16966 Commits

Author SHA1 Message Date
Shifty/Anthomansland
de4fdf31fa Fixes spawning a plasmamman 2019-04-19 18:35:24 +02:00
Kurfursten
925b4ce273 Merge pull request #22520 from otatoh/overlayfix 
Fixes an oopsie in chem dispenser overlays
 2019-04-18 16:43:31 -05:00
Peter Wedder
11c76d6672 Merge branch 'Bleeding-Edge' into boozegrammar 2019-04-19 00:20:00 +03:00
brndd
dd3be1d3cf limes 2019-04-19 00:17:37 +03:00
brndd
64a39bcece ok 2019-04-19 00:16:43 +03:00
brndd
f480489713 big derp 2019-04-18 23:58:47 +03:00
brndd
450b945026 New ninja jectie and sake heals ninjas 2019-04-18 23:47:45 +03:00
otatoh
2a20d60abf fixes overlay showing up wrong on children of chem dispenser 2019-04-18 15:29:13 -04:00
Kurfursten
4e036d3441 Merge pull request #22442 from PaulRitter/ghetto_screwdriver 
Ghetto screwdriver
 2019-04-18 13:39:53 -05:00
Kurfursten
b3dcb38dd5 Merge pull request #22452 from brndd/spiderbot_passtable 
Let spiderbots tablecrawl
 2019-04-18 13:30:59 -05:00
Kurfursten
fc6eeb23c7 Merge pull request #22479 from jknpj/droids 
Androids -> Droids
 2019-04-18 13:30:35 -05:00
Kurfursten
72ee3f7be3 Merge pull request #22492 from brndd/alphabetized_ai_icons 
Alphabetized the AI spritepick lists
 2019-04-18 13:18:38 -05:00
Kurfursten
e7859eb404 Merge pull request #22478 from DeityLink/20190416-Manifested 
Pale Beings no longer scream or jitter when hit by electrode and a custom message is displayed.
 2019-04-18 13:17:41 -05:00
Kurfursten
fd18bf3672 Merge pull request #22468 from brndd/sake_sprite 
Adding sake sprites and a new cocktail for it
 2019-04-18 13:10:24 -05:00
Kurfursten
3a442f6eb4 Merge pull request #22063 from jknpj/hosborg 
Security cyborg H.O.S. upgrade, W.A.T.C.H. upgrade tweak and more.
 2019-04-18 13:05:52 -05:00
Kurfursten
39a2a767f0 Merge pull request #22253 from MadmanMartian/burn_damage_ash 
Burn damage can cause ashing in high amounts
 2019-04-18 13:05:29 -05:00
Kurfursten
6c58844a97 Merge pull request #22417 from SirSkeleto/patch-4 
numbers i like better: part three
 2019-04-18 13:04:05 -05:00
Kurfursten
8260238064 Merge pull request #22410 from ShiftyRail/LorentzDistribution 
New equation for threat
 2019-04-18 12:58:06 -05:00
Kurfursten
fd4621ce5c Merge pull request #22404 from ShiftyRail/Magboots 
Re-adds magboots verb.
 2019-04-18 12:57:50 -05:00
Kurfursten
8fc5aa4b2f Merge pull request #22398 from PaulRitter/fix_welding_mask 
makes the weldingmask start opened
 2019-04-18 12:57:13 -05:00
Kurfursten
2592cb3b31 Merge pull request #22424 from bathosbathtime/bathosAcidsAgain 
Acutely Adjust Acids Again
 2019-04-18 12:53:37 -05:00
Kurfursten
b62244d884 Merge pull request #22444 from PaulRitter/treadmill_verbs 
added rotate verbs for the treadmill
 2019-04-18 12:53:11 -05:00
ValkyrieSkies
a6602c1999 Solarboards (#22409) 
* Adds Solar Tracker Electronics to the Imprinter

* accidentally forgot to uncomment while testing compile error
 2019-04-18 09:54:56 -04:00
Kurfursten
c33fc00d72 Merge pull request #22367 from ShiftyRail/VampShapeshift 
Refactors appearance randomisation.
 2019-04-18 05:23:15 -05:00
Kurfursten
e8948103b4 Merge pull request #22476 from brndd/more_stamps 
Adds stamps for the warden, the internal affairs agent and the chaplain
 2019-04-17 17:47:59 -05:00
DeityLink
bd5668bbb9 dem 2019-04-17 19:35:17 +02:00
brndd
c2fa95fe13 alphabetized the AI spritepick lists 2019-04-17 07:40:03 +03:00
brndd
732f3d11d2 fixed the descriptions in chemistry reagents as well 2019-04-17 04:01:42 +03:00
boy2mantwicethefam
75877b7bed I pressed this accidentally 2019-04-17 01:18:37 +03:00
boy2mantwicethefam
2344d2d724 Combat text has better readability 2019-04-17 01:16:17 +03:00
jknpjr
33a00afa27 Androids -> Droids 2019-04-16 16:14:26 -03:00
DeityLink
edc73694ca ManifestedMacroFixes 2019-04-16 20:32:26 +02:00
brndd
254719ece0 Added some new text for smoky room 2019-04-16 17:25:01 +03:00
brndd
28eccedd14 soy 2019-04-16 16:50:54 +03:00
brndd
98bf93b07a concoction 2019-04-16 15:58:04 +03:00
brndd
45c15d70bc Joe description improvement 2019-04-16 15:23:53 +03:00
MadmanMartian
3b7c2f5c96 You can now shoot narsie (#22035) 2019-04-16 09:19:27 -03:00
MadmanMartian
19cd64e255 Adds some needed sanity to client send_resources (#21737) 2019-04-16 09:11:57 -03:00
ScrewdriverSurvivor
837e1669ad unit tests for reject_bad_name (#22355) 2019-04-16 08:55:13 -03:00
brndd
166370c24b Added chaplain's stamp and sprite for it. 2019-04-16 13:10:11 +03:00
brndd
26251ab137 Smokyroom description fix 2019-04-16 13:01:33 +03:00
brndd
6f1e77e082 coloring -> coloration 2019-04-16 12:13:27 +03:00
brndd
be255042c9 singulos aren't bluespace 2019-04-16 12:11:36 +03:00
brndd
c31ebdb503 berry juice its -> it's 2019-04-16 12:09:56 +03:00
brndd
ac91c965eb james bond 2019-04-16 12:06:23 +03:00
brndd
12e17d9142 way -> path 2019-04-16 11:51:13 +03:00
brndd
ef920c1953 added a period 2019-04-16 11:50:51 +03:00
brndd
db5d604271 Drinks grammar pass 2019-04-16 11:45:07 +03:00
brndd
9ec8ac3816 added IAA stamp 2019-04-16 05:38:01 +03:00
brndd
d2a61890e5 Added the warden's stamp 2019-04-16 04:49:42 +03:00