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
6,892 Commits 73 Branches 18 Tags
e4c4f77de2089f7bd5daa1903fcdfc2ee69f2897
Commit Graph

5168 Commits

Author SHA1 Message Date
SkyMarshal
e4c4f77de2 Fix for the runtime Mloc sent me. 2012-08-03 10:40:54 -07:00
Cael_Aislinn
388d0b9be0 some tweaks to vermin spawning 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 02:06:26 +10:00
Cael_Aislinn
6e0046c77d players who died while in control of simple_animals should now have their name display properly 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 01:42:48 +10:00
Cael_Aislinn
223cee4aa3 fix for non-working shutters and blast doors on exodus and antiqua 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 01:42:03 +10:00
Cael_Aislinn
fd7ddfa11a removed all kobold speak messages 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 00:28:48 +10:00
Cael_Aislinn
c87bb36e90 missing icon file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-04 00:15:37 +10:00
Cael_Aislinn
e695bf3ed1 removed hanging simple_make options 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:27:33 +10:00
Cael_Aislinn
3f4d2500f6 holding exact required credits will now bring success 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:25:09 +10:00
Cael_Aislinn
1c2bb7e750 fixes to vermin spawning, replaced rag spawners in map with actual rags 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:21:43 +10:00
Cael_Aislinn
d8782639da replaced adv first aid in medical supply crates, upped cost to 20 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:11:56 +10:00
Cael_Aislinn
d734754763 emergency supplies are a bit more cost-effective 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 20:07:13 +10:00
Cael_Aislinn
d20a7a50f1 compile fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:56:45 +10:00
Cael_Aislinn
7fce61598a new traitor objective to steal money 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:49:01 +10:00
Cael_Aislinn
baac6fe04c fix for kobold doing stuff while dead 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 19:17:34 +10:00
Cael_Aislinn
6caa6c62cc remove adv first aid kit from medical crates and upped cost to 15, upped cost of electrical crates to 20, increased cost of all engine crates at 10 to 15 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 15:17:24 +10:00
Cael_Aislinn
f8e0f5a925 Merge branch 'master' of https://github.com/Baystation12/Baystation12 
Conflicts:
	baystation12.dme
 2012-08-03 15:06:02 +10:00
Cael_Aislinn
d2d808231e automated anti-meteor missile battery, dme changes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-03 14:58:51 +10:00
CIB
a1d362b795 Fixed custom votes 
The old method of passing the voter as href was still used by custom votes, making Topic() believe anyone doing custom votes was cheating. Thank god there was no auto-ban.
 2012-08-03 05:43:39 +03:00
SkyMarshal
4f7f3e5d7f Adds more runtime checking and makes zones exploit the garbage collector to be destroyed, which is more resource efficient. 2012-08-02 11:47:05 -07:00
Cael_Aislinn
1f0d8d7db0 modified the changelog, and made roaches die on bump() 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 21:56:26 +10:00
Cael_Aislinn
f3180fed6d possible fix for recent crash /shrug 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 18:47:14 +10:00
Cael_Aislinn
e9d68bd249 vermin spawn randomly in maintenance (plus a couple of other areas) at a rate of one every 10-15 mins. 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 15:39:00 +10:00
Cael_Aislinn
1e9d218e16 fix indentation errors, etc 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 15:22:40 +10:00
Cael_Aislinn
3b3a41053e new supply packs, modified existing ones slightly (http://baystation12.net/forums/viewtopic.php?f=5&t=5056&p=97631) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 15:16:58 +10:00
Cael_Aislinn
4a9383b5af reworked id spawning, added some fixes 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 14:33:19 +10:00
Cael_Aislinn
3c168305ed reworked equip_if_possible to be a bit better 2012-08-02 14:33:00 +10:00
Cael_Aislinn
b535890090 Merge branch 'capspace' of https://github.com/FireFishie/Baystation12 2012-08-02 04:58:16 +10:00
Cael_Aislinn
7ae269f38f some tweaks to mice and roaches, tried to get the gameticker to periodically spawn them but failed (will come back to) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-08-02 04:56:48 +10:00
Cael_Aislinn
469a8bb601 ported over the majority of /tg's simple_animal code and changed a lot of things for simple_animals and critters 
- added bears, mice (cats will chase mice, mice squeak occasionally)
- removed some unique simple_animals (ian and runtime will be the only ones for now)
- structure improvements, tweaks and cleanup for simple_animals and critters
- space carp should work fine now
 2012-08-02 03:22:44 +10:00
FireFishie
8a9962a234 By vote, space proofed captain armor and changed the memo 
Vote link and new memo message in the comments!
 2012-08-01 03:58:50 -04:00
CIB
e9937050aa Merge pull request #1558 from FireFishie/closets 
Some minor changes, mostly related to wardrobes and fluff text
 2012-08-01 00:23:05 -07:00
Albert Iordache
c3c6b6b557 Fixed a ChemMaster exploit. Thanks to Doohl for fixing, and LLA admins for letting us know 2012-07-31 17:22:43 +03:00
FireFishie
fae6f2eecd "Space Law" on the wiki is always capitalized, so now it should be in-game too. 2012-07-31 04:45:07 -04:00
FireFishie
60c962ebb8 Clipboard added to the head of personnel's wardrobes and starting items. If the quartermaster has a clipboard on him and in his wardrobe bag, then his boss should too. 2012-07-31 04:36:32 -04:00
FireFishie
eac1335607 Added the warden jacket and pepperspray to the warden's wardrobe, and added fingerless gloves to the cargo technician and shaft miner wardrobes. 
The janitor spawns with a portalathe but doesn't have one in his wardrobe, so this adds that. If the librarian gets a barcode scanner in his, then the janitor's should include the portalathe.

The captain has taken a few lessons from the head of security! When joining, the captain will now start with matching gloves, a pair of jackboots, and the more sensible captain's cap. The old Napoleonic hat is still available in the captain's closet, and both the closets and wardrobes were updated to reflect this change.

The quartermaster started with brown shoes, but only had black ones available in his wardrobes. This change should make his starting equipment more consistent.

The head of personnel should no longer be so paranoid, and now spawns without wearing body armor or a helmet. Additionally, the body armor and helmet from the wardrobe closet and bag were removed. A gun, helmet, and body armor are still available in the secure locker for emergencies.

The breath mask inside the engineer box included with the ERT backpack looked terrible when worn with the ERT helmet, yet was required if any of the team were operating near a breach or anything. This change only returns the removed SWAT mask (which leaves the helmet sprite intact) to the response team's basic equipment.

Both the secure closet and the wardrobe bag have the medsci headset in it, and the chemist lab is conjoined with research, so why shouldn't the chemist start with that headset? This commit also moves the chemist to Medical on the roster because that's where the job shows up everywhere else.
 2012-07-31 01:21:44 -04:00
FireFishie
8c7592fa00 Changed all entries of "Nanotrasen" to "NanoTrasen" and corrected the misspelling of "apologize" in the gravity toggle messages. 2012-07-31 01:14:14 -04:00
Albert Iordache
c7d3fa6bbf Merge pull request #1556 from Nerezza/atmosgear 
Red hardhats for atmos!
 2012-07-30 14:27:27 -07:00
Nerezza
b6d6dc2574 modified: code/game/jobs/job/engineering.dm 
modified:   code/game/objects/closets/wardrobe.dm
 2012-07-30 13:09:52 -05:00
Nerezza
973c1ea876 Update code/modules/customitems/item_spawning.dm 2012-07-30 12:32:35 -05:00
Nerezza
ea9af8242e modified: code/modules/customitems/item_defines.dm 
modified:   code/modules/customitems/item_spawning.dm
	modified:   icons/obj/custom_items.dmi
 2012-07-30 10:15:22 -05:00
Fire
daaa21eabd Flashkirby99's tajaran 
Kirby's kitties are now chopped up and ready for action with their
hairstyles added to the face file. Also tidied up the south human female
chest and torso to be more consistent with both their other directions
and the male's.
 2012-07-30 03:27:03 -04:00
CIB
35eb1a52c6 Merge pull request #1546 from Mloc/dev 
Null checks, fixed cael's derp.
 2012-07-29 13:18:43 -07:00
CIB
79d4c39754 Fixed cryo pressure damage 2012-07-29 23:15:42 +03:00
Mloc
ba370735ff NULL checks. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-07-29 18:34:12 +01:00
Mloc
333f0903e8 Merge pull request #1534 from caelaislinn/master 
blast doors, lockdown comp, pets
 2012-07-29 08:46:18 -07:00
Jim "Apples"
af8324ec7d Merge pull request #1543 from Mloc/dev 
Custom items + New cow sprite.
 2012-07-29 08:37:33 -07:00
Mloc
7cc57deb17 Merge pull request #1544 from TurboCamel/master 
Finish commenting out collectible crate
 2012-07-29 08:37:02 -07:00
Mloc
4d240daa7e Custom items + New cow sprite. 
Signed-off-by: Mloc <colmohici@gmail.com>
 2012-07-29 16:32:52 +01:00
Mloc
b34aae0c05 Merge pull request #1542 from comma/master 
Fix for admin rejuv
 2012-07-29 08:32:05 -07:00
TurboCamel
6abb7b6e8d Finished commenting out collectible hat crate 
Sorry, my previous submission left an undefined variable because the collectible hat crate *still* wasn't completely commented out. This should fix the problem.
 2012-07-29 10:30:21 -05:00