cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-05-16 11:50:11 +01:00
Code Issues Packages Projects Releases Wiki Activity
10,420 Commits 12 Branches 2 Tags
70a82fcde673d7dea8e05b76fb59afa254a67de9
Commit Graph

4371 Commits

Author SHA1 Message Date
Jim "Apples" 70a82fcde6 Merge pull request #2080 from Zuhayr/master 
Oen'g's baton (Custom item)
 2012-12-18 05:14:23 -08:00
Zuhayr d59b160f80 Oen'g's baton. 2012-12-19 00:13:19 -08:00
cib d0735e9a87 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into feature 
Conflicts:
	code/ZAS/ZAS_Zones.dm
	code/game/gamemodes/events.dm
 2012-12-16 15:10:04 +01:00
cib 933e53aa98 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into minor_feature 
Conflicts:
	code/game/gamemodes/events.dm
 2012-12-16 15:02:54 +01:00
cib 679c715482 Merge branch 'master' of github.com:Baystation12/Baystation12 into minor_feature 2012-12-16 14:57:54 +01:00
Hawk-v3 9ed0e80acf Merge pull request #2058 from GauHelldragon/master 
Portable Generator Fix
 2012-12-16 05:55:56 -08:00
Zuhayr 45527ec599 Four custom items plus config.txt. 2012-12-16 00:40:04 -08:00
cib 7cf3244316 Fixes issue #2059 
Mob transform into monkey no longer uses hardcoded DNA size of 14.
 2012-12-16 04:57:32 +01:00
cib cc2057240a Fixed two compile errors. 2012-12-16 04:23:57 +01:00
cib 9c4a48ffe5 Gibbing now creates actual limbs instead of decals. 
Especially useful for the head, but also pretty nice in that you can now pick the limbs up and mail them to security.
 2012-12-16 03:25:26 +01:00
Jim "Apples" cff920917b Merge pull request #2054 from caelaislinn/work_in_progress 
Various
 2012-12-15 04:08:07 -08:00
Zuhayr aedf5f2068 Ty Foster's custom necklace, Butcher Royce's custom Ripley skin and some minor changes to support it. 2012-12-15 02:08:03 -08:00
Cael_Aislinn b7804cc295 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/bleeding-edge-freeze' into work_in_progress 2012-12-15 00:39:16 +10:00
Cael_Aislinn d1cf168480 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-15 00:39:07 +10:00
Zuhayr 6c3aec4198 Nasir's custom medallion. 2012-12-14 00:14:24 -08:00
Zuhayr f8af31bdda Three custom items: Ana Ka'Rimah, Jane Doe, Altair An-Nasaqan. 2012-12-13 02:40:45 -08:00
GauHelldragon 0db60b65c7 Portable generator Fix 
Portable generators properly drop their fuel when deconstructed
Portable generators need their cover open to be destructed now
Fixed a runtime error when building a portable generator with a 2s wire
 2012-12-12 02:49:29 -08:00
cib 8b90cd6fa8 Experimental: Disable temperature exchange with space and add low 
pressure damage.

This'll stop the ridiculous cold temperatures from opening an airlock
for half a second.
 2012-12-11 14:57:28 +01:00
cib 96fb7cf14b Rebalanced spaceacillin metabolism. 
It used to be something like 1 unit per tick, which only lasted around 2
minutes for 15 units. Now it'll last a bit longer, making it actually
useful.
 2012-12-11 13:22:44 +01:00
cib f664e7c99d Fixes issue #2033 2012-12-11 12:07:11 +01:00
Cael_Aislinn d6a1bade5b Merge branch 'features' into work_in_progress 2012-12-11 12:39:22 +10:00
Cael_Aislinn 21c9f55654 Merge remote-tracking branch 'remotes/Baystation12/Baystation12/master' into work_in_progress 2012-12-11 12:38:58 +10:00
Mloc 9d60a87ee4 Merge pull request #2020 from GauHelldragon/master 
Service Borg Upgrade
 2012-12-10 08:44:33 -08:00
cib fd4a3576d4 Fix to the improved player notes list. 2012-12-09 21:00:36 +04:00
cib c56974f2e8 Fixes issue #2043 
Player notes list now has a better organized interface, which should prevent BYOND overloading and dying a gruesome death.
 2012-12-09 16:04:43 +01:00
cib a911d5de43 Merge branch 'master' of github.com:Baystation12/Baystation12 2012-12-09 15:34:15 +01:00
cib 0201e83fcb Merge branch 'master' of github.com:CIB/Baystation12 2012-12-06 15:15:25 +01:00
cib 6ab420237b Attack log will now store type path for bullets. 2012-12-06 15:14:17 +01:00
Jim "Apples" 84bcc87e45 Merge pull request #2027 from SweeperM/master 
Fixes to lighting
 2012-12-03 03:09:02 -08:00
Cael_Aislinn f7d41058ed Merge branch 'work_in_progress' of github.com:caelaislinn/Baystation12 into features 2012-12-03 18:56:16 +10:00
Cael_Aislinn 39f07d50bf Merge https://github.com/Baystation12/Baystation12 into features 2012-12-03 18:54:21 +10:00
Cael_Aislinn cc2771d4d5 thrown facehuggers only have a 25% chance of hitting now, and they have a chance to miss when leaping normally 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:58:58 +10:00
Cael_Aislinn ee04fd9f1e significantly reduced alien disarm-stun time (from 10-15 seconds to 0.5-3 seconds), reduced stun chance, added a 25% chance to stun the alien, reduced alien heal rate on weeds from 5 to 1 (they still heal toxin damage at a rate of 5) 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:54:29 +10:00
Cael_Aislinn d09d7bf313 changed alien neurotoxin to bio type projectile (which means it's stopped by protective gear like biosuits), fixed a runtime 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:50:57 +10:00
Cael_Aislinn 6d1ea0548d Merge branch 'master' of https://github.com/Baystation12/Baystation12 into work_in_progress 
Conflicts:
	code/modules/customitems/item_defines.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 13:08:47 +10:00
Cael_Aislinn d55170ab97 fixed an extra line added 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-03 01:04:14 +10:00
Chinsky ab440fbf7d Fixed compile error in custom items. 
Made rigs protect against radiation again.
 2012-12-01 18:35:27 +04:00
Cael_Aislinn 3b6c00eae5 made space ninja a toggleable client option 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:07:18 +10:00
Cael_Aislinn c8f603cebd WIP stuff for skin styles sprite accessory 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:07:02 +10:00
Cael_Aislinn 7e3f58cea2 CPR optimisations, made hypospray visible on the map 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:06:19 +10:00
Cael_Aislinn 9391d55e6e compile fix 
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
 2012-12-01 18:05:05 +10:00
SweeperM b8a12b0b52 Fixes to lighting 
-Fixed #2005 (for sure!)
-Fixed the stacking of brightness. Now the most bright item turned ON will be the one where the user gets its luminosity of.
-Cleaned the code a bit. Now only one var controls the on/off switch of light, and another holds the value of brightness when on.
 2012-11-29 23:01:51 +00:00
GauHelldragon 01828f8a02 Added more comments 2012-11-29 12:21:38 -08:00
GauHelldragon 06ae2ded6f Change - Robotray only picks up food/drinks/condiments 2012-11-29 12:10:30 -08:00
MrYeti 1c3d72e471 Added My own Custom item and Misterbook's pipe spawning in his backpack. 
Also deleted some stuff that were requested for deletion.
 2012-11-28 16:38:40 -05:00
GauHelldragon 17440ff756 Fixed blood regen bug 
Nutriment is stored in reagents. Vessel is only for blood.
 2012-11-28 12:37:27 -08:00
GauHelldragon 2c47afc22e Roboitems - Printing Pen 
Allows service borg to rename paper. Click on pen to toggle between writing and renaming mode.
 2012-11-28 03:03:20 -08:00
GauHelldragon 09f1d74566 Fixed typo in tray description 2012-11-27 15:24:44 -08:00
GauHelldragon 5e74a9803c Modified Service Bot's Tray to actually be useful 
Service Borg's tray now can load and unload items.
 2012-11-27 15:16:59 -08:00
MrYeti 69992184d3 Deleted the items! 2012-11-27 14:16:21 -05:00