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
27,836 Commits 73 Branches 18 Tags
3177b3af1353f1fc7f428cb0ec7cc1856c9a0d5b
Commit Graph

20918 Commits

Author SHA1 Message Date
Sood
3177b3af13 Reverted admin debug changes, nulled references after qdels 2015-12-06 15:11:57 -08:00
Sood
3cdf89b675 qdel replacing del, time for bugs 2015-12-06 15:11:15 -08:00
Rob Nelson
f7f2783829 Merge pull request #6885 from Probe1/Chisel_Improvements 
Chisel improvements for #6882
 2015-12-06 15:06:38 -08:00
Rob Nelson
ba91692085 Merge pull request #6889 from dylanstrategie/Chem-Hotfix 
If you're going to overwrite, at least try to figure out what the changes were
 2015-12-06 15:06:17 -08:00
Rob Nelson
464e857f40 Merge pull request #6892 from unid15/why_the_fuck_wasnt_this_a_thing 
Adds two mob helper procs
 2015-12-06 15:05:46 -08:00
D3athrow
c5d4ae2910 fix when 2015-12-06 15:18:44 -06:00
D3athrow
d92f5eb716 fuck 2015-12-06 14:37:51 -06:00
unid15
84b1b16658 fix typo 2015-12-06 20:30:18 +01:00
unid15
2b13be60d7 adds mob/isUnconscious() and mob/isDead() 2015-12-06 20:27:58 +01:00
dylanstrategie
33d87c95ad If you're going to overwrite, at least try to figure out what the changes were 2015-12-06 17:56:46 +01:00
D3athrow
1b1de4f7c1 hurf 2015-12-06 09:21:22 -06:00
Probe1
bd9863e00b Resolves https://github.com/d3athrow/vgstation13/issues/6882 by adding a period and also adds some cancel buttons! Hurrah for cancel! 
Allows players to select engravings from a list rather than a random engraving.  Credit to unid15 for the code and holding my hand.
 2015-12-06 07:03:32 -05:00
D3athrow
990f33084a shitmixedmodeithink 2015-12-05 23:24:45 -06:00
D3athrow
c9a51d65d3 somehow missed these two 2015-12-05 21:41:29 -06:00
Rob Nelson
dadbe92c86 Inventory Datum, pt1/x 2015-12-05 16:52:33 -08:00
D3athrow
e7b583ff29 Proper fix to prevent RPD from making a thing while storing it. 2015-12-05 15:38:34 -06:00
D3athrow
0571df3515 Fixes RCD deriatives going into storage while trying to make something 
If someone else has a better idea on how to fix this feel free to. (reverted from commit cef7e69c7a)
 2015-12-05 15:37:15 -06:00
Rob Nelson
9b3295c26a Merge pull request #6881 from unid15/wod 
Woodcutting
 2015-12-05 11:52:10 -08:00
Rob Nelson
55a340d988 Merge pull request #6872 from Probe1/ArnoldPalmer 
Adds an Arnold Palmer to the game with a new sprite for it.
 2015-12-05 11:51:27 -08:00
Rob Nelson
07e26a7982 Merge pull request #6876 from Probe1/Achievement_Cancel 
Fixes #6873
 2015-12-05 11:49:29 -08:00
unid15
93a458fce1 remove ancient stuff, explosives have an effect on the trees 2015-12-05 18:31:00 +01:00
ririchiyo
cef7e69c7a Fixes RCD deriatives going into storage while trying to make something 
If someone else has a better idea on how to fix this feel free to.
 2015-12-05 12:30:03 -05:00
ririchiyo
e07443bdb0 lets actually look over these changes before we merge them and ban dylan from 
making any formatting changes in the future.
 2015-12-05 11:58:42 -05:00
Probe1
c577ec546a Adds if(achoice == Cancel) return. It works but I don't understand why. 
Adds cancel to player list stage

This should NOT have taken 3 commits and 2 hours!

all steps but final step have cancel
 2015-12-05 08:32:35 -05:00
unid15
a02bfa6abd woodcutting 1.0 2015-12-05 11:57:37 +01:00
Probe1
75a2a210da Adds an Arnold Palmer to the game with a new sprite for it. 
Better icon 4 u

best sprite

Changelog and squish commits
 2015-12-05 04:56:34 -05:00
Rob Nelson
6b99c02983 Merge pull request #6806 from dylanstrategie/Chem-Hotfix-V2 
Chemistry Sanity Redux
 2015-12-04 12:34:47 -08:00
Rob Nelson
e9b1da9b5b Merge pull request #6790 from Arthurdentist/summonrobe 
Adds a Summon Robes Spell
 2015-12-04 00:34:47 -08:00
Rob Nelson
6dffd8eef1 Merge pull request #6791 from Kurfursten/atmostweaks 
Atmos Traitor Item Tweaks
 2015-12-04 00:34:18 -08:00
Rob Nelson
dcc2525d83 Merge pull request #6822 from Kurfursten/chairbalance 
Wheelchair Balance
 2015-12-04 00:33:50 -08:00
Rob Nelson
74a84dae24 Merge pull request #6856 from 9600bauds/theririmaddener 
Batbelt can hold hookshot
 2015-12-03 18:34:24 -08:00
Rob Nelson
b6a8b4a686 Merge pull request #6849 from dylanstrategie/Fucking-Recipes 
Change Brown Star recipe
 2015-12-03 18:33:54 -08:00
Rob Nelson
95b53a38be Merge pull request #6850 from Kurfursten/vchf 
fixes #6819
 2015-12-03 18:33:32 -08:00
Rob Nelson
99d783cbb3 Merge pull request #6853 from 9600bauds/wheresthebombwheresthebombwheresthebombwheresthebombwheresthebombwheresthebomb 
Adds Cuban Pete bombs as a rare prize from non-emagged arcade machines
 2015-12-03 18:32:54 -08:00
clusterfack
5462cbd2a0 Better solution to fix #6818 and fix #6828, should resolve any weird behaviors 2015-12-03 15:52:02 -06:00
9600bauds
00eb61a1d6 Batbelt can hold hookshot 2015-12-03 18:06:42 -03:00
clusterfack
ca98e45b78 Apparently sleep cancels entered 2015-12-03 12:19:27 -06:00
9600bauds
42a8f8889c Adds bombs as arcade prizes. 2015-12-03 12:23:05 -03:00
D3athrow
664084688e Properly fix #6641 2015-12-03 01:16:55 -06:00
Kurfursten
b75ade89c3 HE'S A MANIAC 2015-12-02 22:02:43 -06:00
dylanstrategie
45782f2110 Tweak B52 recipe 2015-12-03 03:24:19 +01:00
dylanstrategie
3f0978d449 Change Brown Star recipe 2015-12-03 03:20:13 +01:00
Rob Nelson
21ac6a599a Merge pull request #6792 from Probe1/Box_changes 
Box changes
 2015-12-02 16:51:06 -08:00
d3athrow
70ba685ce7 Merge pull request #6838 from Kurfursten/grenadehf 
fixes #6331
 2015-12-02 15:34:38 -06:00
Kurfursten
9266d3a590 AWAKEN MY SCRUBBERS 2015-12-02 15:03:52 -06:00
Kurfursten
05df6b7663 Done 2015-12-02 14:38:45 -06:00
clusterfack
b5ffe652ab Merge pull request #6834 from ShiggyPiggy/patch-1 
Typos are rude
 2015-12-02 13:48:47 -06:00
clusterfack
15491dffd7 Merge pull request #6836 from unid15/id_rather_be_high 
Fixes shuttles not finding docking ports on some custom maps
 2015-12-02 13:47:59 -06:00
clusterfack
fd08469c30 Merge pull request #6813 from NigglyWiggly/FUCKING-SPACE-CORGIS- 
CORGIS IN SPACE
 2015-12-02 13:15:44 -06:00
unid15
b7cc31782d fixed shuttles not finding docking ports on custom maps 2015-12-02 15:27:32 +01:00