cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 01:22:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,846 Commits 2 Branches 1 Tag
c3c6b6b557954fdf23b2ea968b0ae2bc333aaae9
Commit Graph

5133 Commits

Author SHA1 Message Date
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
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
comma
60f87cf538 Fix for admin rejuv breaking examine 2012-07-29 19:30:07 +04:00
Cael_Aislinn
2909b86195 this time, with the actual file 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-30 01:27:53 +10:00
Cael_Aislinn
c296286e52 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-30 01:26:10 +10:00
Cael_Aislinn
c913f81517 played around with pets. hid a special one in the mining base 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-30 01:25:06 +10:00
Albert Iordache
4f5bdc6c64 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-07-29 15:50:44 +03:00
Mloc
fe4de6ac07 Merge pull request #1537 from TurboCamel/master 
Fixed bugs with power control module supply pack and collectible hat crate
 2012-07-29 05:50:14 -07:00
Albert Iordache
8a340237c6 Merge branch 'master' of https://github.com/comma/Baystation12 into comma-master 
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
 2012-07-29 15:49:56 +03:00
comma
b2522daa5d Surgery bugs. 
Stopped attacking patient during head surgery with hemostat.
Was caused by try_bone_surgery called twice in code.
Removed one redunant call.

Fixed runtimes during face surgery.
Null organ was caused by not being 'mouth' organ there.
Made it select 'head' as affected organ.
 2012-07-29 08:21:37 +04:00
CIB
35b1e7efd6 Experimental change to speed up atmos 
Kudos to /tg/
 2012-07-29 03:29:45 +03:00
TurboCamel
5734a2df15 Fix PCM supplies, finished removing hat crate 
Power Control Module supplies are now called APC and Airlock Electronics crate, as you get one box each of power control modules and airlock circuit boards. It also ought to be under the engineering heading, so I moved it there. 

Also, someone had incompletely removed the collectible hat crate. You could still order it but nothing would arrive, so I finished commenting it out.
 2012-07-28 17:07:39 -05:00
TurboCamel
b40704a2fe Added airlock electronics box 2012-07-28 16:41:57 -05:00
TurboCamel
005b5ec1e5 Added new circuit boxes 
Added power control module box and airlock electronics box.
 2012-07-28 16:37:17 -05:00
Cael_Aislinn
1ecbc5c950 modified lockdown computer and blast doors / shutters on antiqua and exodus, now has increased usability etc. 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-29 03:28:50 +10:00
CIB
2d333b743c Merge pull request #1532 from headswe/master 
Firedoors are now "emergency shutters" and have a new sprite.
 2012-07-28 09:33:13 -07:00
Head
ee6c81dc47 Firedoors are now "emergency shutters" and have a new sprite. 2012-07-28 18:30:57 +02:00
Head
7ae24d3d36 Added nullcheck to mind.dm 2012-07-28 18:05:32 +02:00
CIB
cae467ce39 Merge pull request #1531 from headswe/master 
Fixes a few runtime errors
 2012-07-28 08:55:22 -07:00
Head
f814d99249 Added condition to the rest of the code in effect_system.dm 2012-07-28 17:53:13 +02:00
Head
04fac7a528 Fix for the fix!, God i hate byond code. 2012-07-28 17:46:25 +02:00
Head
3a1f30ece4 A few fixes. 2012-07-28 17:16:22 +02:00
CIB
63e826d119 Derp, edited the wrong variable 2012-07-28 17:01:20 +03:00
CIB
c1ec998c1f Fix power outage problems, take 2 2012-07-28 16:59:59 +03:00
CIB
c4b21c61f7 Quickfix for station losing power in less than 10 minutes 2012-07-28 16:50:10 +03:00
CIB
1952a6fc3a Lighting now turns off before equipment 2012-07-28 16:46:54 +03:00
Mloc
2569bb1d83 Merge pull request #1530 from caelaislinn/master 
tgstation.dmm mapfixes, antiqua.dmm engine updates, R-UST updates
 2012-07-28 04:42:03 -07:00
Cael_Aislinn
09687957d9 particles should actually dmg properly, instead of error. cant believe this didnt come up earlier 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 21:40:07 +10:00
Albert Iordache
8fada000e7 Fixed a ZAS/Processing.dm runtime error 2012-07-28 10:34:24 +03:00
Cael_Aislinn
bd4ce09264 remove debug output 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 17:27:27 +10:00
Albert Iordache
3cf5cb0d3d Merge pull request #1522 from caelaislinn/powerchanges 
powerchanges
 2012-07-28 00:23:27 -07:00
Cael_Aislinn
760e86c4b0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-28 17:19:35 +10:00
Cael_Aislinn
1d002bb361 additional tweaks to r-ust 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 17:19:17 +10:00
Cael_Aislinn
c9b4fdbaef tweaks to shield generators, added shield generator to the admin shuttle (would have added it to other shuttles, but most are too small) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-07-28 13:15:02 +10:00
Cael_Aislinn
6a713bc18b Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-07-27 21:42:03 +10:00
SkyMarshal
62dcb7be1b Adds caching to dummy objects, seems to work great. 2012-07-26 17:14:31 -07:00
SkyMarshal
54ce48fb9d Connections no longer are deleted when a door closes, instead persisting until merged or a wall is built there or something. Better runtime detection, and no more searching through world for fires to process. 2012-07-26 15:33:21 -07:00