cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 02:16:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
34,960 Commits 73 Branches 18 Tags
fa7b533b48fce6bee56f74317d2f90f3ea0e3c8e
Commit Graph

34960 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
unid15
fa7b533b48 Spawn QOL 2017-10-29 08:36:32 +01:00
Adrian Dias da Costa Lima
8984ad596a runtime fix (#16245) 2017-10-17 19:21:51 -04:00
Shadowmech88
ea6c50fee9 Fixes Colt cocking. (#16267) 2017-10-17 19:20:15 -04:00
PJBot
e69f3f5f61 [ci skip] Automatic changelog update. 2017-10-17 13:08:49 +02:00
Carlen White
977912ed26 Should fix isvampire runtime (#16251) 
Checks for a mind before checking if the mind has a vampire.
 2017-10-17 06:07:42 -05:00
Rob Nelson
a50a28e8f0 Merge pull request #15726 from MadmanMartian/scooty 
[NEEDS REVIEW] [INSERT NAME HERE] revisited
 2017-10-15 16:27:49 -07:00
MadmanMartian
fb0b65d04a Merge branch 'Bleeding-Edge' into scooty 2017-10-16 00:09:47 +01:00
PJBot
0ed5c825af [ci skip] Automatic changelog update. 2017-10-16 00:30:10 +02:00
Rob Nelson
b92b4535bf Merge pull request #16223 from Shadowmech88/IAmGoingIntoBattleAndIWantYourStrongestPotions 
Wizard Potions
 2017-10-15 15:28:59 -07:00
PJBot
04a57c061c [ci skip] Automatic changelog update. 2017-10-16 00:27:59 +02:00
Rob Nelson
efbd2cd137 Merge pull request #16238 from DamianX/ThrownItemsFix 
Fix catched thrown items hurting the catcher
 2017-10-15 15:27:08 -07:00
Rob Nelson
4bfe6ec26c Merge pull request #16237 from ShiftyRail/HelpIntentClothing2 
Can extinguish people with clothes on help intent
 2017-10-15 15:26:52 -07:00
ShiftyRail
a0b70d6fe7 Avoids conflitcts 2017-10-15 18:13:53 +02:00
Shadowmech88
6db2b21abd Shifted things around. 2017-10-15 05:07:41 -05:00
Shadowmech88
e2e6e62f0d Adds bottled fireball. 2017-10-15 04:57:17 -05:00
Shadowmech88
f8e97b15bc More potions. 2017-10-14 22:01:23 -05:00
Shadowmech88
1e2d7ec51e Adds potions of fullness, transparency, paralysis, sword, random, minor strength, and major strength. 2017-10-14 18:03:36 -05:00
PJBot
9581b7d21e [ci skip] Automatic changelog update. 2017-10-15 00:52:32 +02:00
Rob Nelson
84bc20ec34 Merge pull request #16222 from DamianX/MistakesWereMade 
Remove crossbow frame recipe
 2017-10-14 15:51:26 -07:00
Rob Nelson
57961eb505 Merge pull request #16241 from yclatious/revert-16233-truth 
UNDO UNDO UNDO
 2017-10-14 14:59:16 -07:00
yclatious
7f6596e7e8 Revert "24/7 Deathmatch" 2017-10-14 22:55:42 +01:00
Rob Nelson
bf2134689c Merge pull request #16233 from N3X15/truth 
HERE'S A SIGNIFICANT CHANGE YOU TREMENDOUS FUCKS
 2017-10-14 14:54:31 -07:00
ShiftyRail
e6f66920ac Makes the code more elegant 
Thanks ShadowMech
 2017-10-14 23:29:02 +02:00
ShiftyRail
5a4fb02fc6 Collapse the if as PJB suggested 
It is not possible to change the if(isplamsaman()) because mob doesn't have a species.
 2017-10-14 23:10:38 +02:00
ShiftyRail
52ec0a4451 Yet another clean up 2017-10-14 22:36:57 +02:00
ShiftyRail
b29d6a46e0 Intigracy is guilty of a genocide against the 'return' keyword 2017-10-14 20:18:38 +02:00
ShiftyRail
597095cb52 Modularity 2017-10-14 19:25:02 +02:00
ShiftyRail
ca7ebf507d Clean up the comments 2017-10-14 17:37:48 +02:00
ShiftyRail
28c0b6019b Typo. 2017-10-14 17:02:38 +02:00
ShiftyRail
8d81439dbb Space Blankets are more effective at putting out fire 2017-10-14 17:01:18 +02:00
ShiftyRail
1ba5c572a7 Cleaning up a bit 2017-10-14 16:38:45 +02:00
ShiftyRail
dec2fbb78d Suggested changes 2017-10-14 16:28:21 +02:00
Damian
29ebc8d1f5 Fix catched thrown items hurting the catcher 2017-10-14 15:25:12 +02:00
ShiftyRail
0c3252446c Can extinguish people with clothes on help intent 2017-10-14 15:06:00 +02:00
Shadowmech88
32011bf16c Added potion of mana, draught of toad, and phial of exanimis. 2017-10-14 00:29:04 -05:00
PJBot
49b1a27315 [ci skip] Automatic changelog update. 2017-10-14 04:16:39 +02:00
Rob Nelson
9c2ebba502 Merge pull request #16209 from DrSnips/summon-swords 
Adds summon swords wizard spell.
 2017-10-13 19:15:32 -07:00
Shadowmech88
900273ac98 Changes 2017-10-13 18:18:14 -05:00
DrSnips
4902fef6d0 Added one for summon magic as well. 2017-10-13 18:22:22 -04:00
DrSnips
23ae18f967 Removed the HF katana from the possible spawns and added custom titles to the respective summon types. 2017-10-13 18:20:29 -04:00
Rob Nelson
7ceabbb5ce rm dead code 2017-10-13 12:42:15 -07:00
Rob Nelson
2c20333904 Turn /vg/ into what it always wanted to be, a 24/7 highlander server. 2017-10-13 12:29:47 -07:00
Shadowmech88
acb687bbb6 Fixes compile error. 2017-10-13 13:23:00 -05:00
Rob Nelson
c4bd1c57b7 Merge pull request #16232 from ShiftyRail/ChangelogFix 
Fixes changelog issues I guess
 2017-10-13 11:13:27 -07:00
Rob Nelson
7b93b11c65 Merge pull request #16231 from ShiftyRail/WelderFix 
Fixes welder failtext and examine
 2017-10-13 11:13:12 -07:00
ShiftyRail
da692dd6d5 Fixes changelog issues I guess 2017-10-13 20:03:05 +02:00
ShiftyRail
09943a1714 Fixes welder failtext and examine 2017-10-13 19:49:55 +02:00
PJBot
3059d97bee [ci skip] Automatic changelog update. 2017-10-13 19:37:08 +02:00
Rob Nelson
ac971f77fe Merge pull request #16227 from MadmanMartian/multi-mass-driver-nono 
can no longer create multiple mass drivers on the same tile.
 2017-10-13 10:36:01 -07:00
MadmanMartian
c215bdc6dd compresses the for loops 2017-10-13 18:14:53 +01:00