cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-05 07:02:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,866 Commits 26 Branches 2 Tags
580c19e0389268bfa114a421f9bd3fa24af73aff
Commit Graph

12912 Commits

Author SHA1 Message Date
ZomgPonies
580c19e038 Machine people have no internal organs 2014-06-10 03:32:34 -04:00
ZomgPonies
e9dbeeab7e Preferences fixes 2014-06-10 03:32:14 -04:00
ZomgPonies
1425001472 Bleh addiction 2014-06-09 19:01:10 -04:00
d3athrow
7fc8fdea05 Fix grabbing aliens grabbing yourself. 
They were not updated to the new grab refactor when click code rework was ported.
 2014-06-09 18:34:23 -04:00
ZomgPonies
a3bb74cf07 Powerarmor derp fixes 2014-06-09 17:51:16 -04:00
ZomgPonies
866c84a3d3 Moar addiction fixes 2014-06-09 17:51:05 -04:00
ZomgPonies
23f2885c01 Moar addiction fixuns 2014-06-09 01:54:03 -04:00
ZomgPonies
fb5265d1b1 You forgot 2 commas, NOW I'm annoyed :D 2014-06-09 01:23:12 -04:00
ZomgPonies
d1f2f9c361 Merge pull request #246 from BobTheBoss64/master 
Added volume to Zippo lighters.
 2014-06-09 01:09:24 -04:00
ZomgPonies
ff5ac9b8a3 Moar addiction fixuns 2014-06-09 01:08:30 -04:00
Michael Slettevold
0a1b0af8f7 Fixed lack of Zippo volume 2014-06-08 20:20:56 -07:00
Michael Slettevold
47ec7fc3f1 Fixed lack of Zippo volume 2014-06-08 20:19:33 -07:00
Michael Slettevold
a30cd63810 Added sound effect for opening and closing Zippo lighters. 
Corrected spelling of "independent", for flagprocs.dm.
 2014-06-08 20:14:33 -07:00
ZomgPonies
0e7ad2e4d5 Addictiveness fix 2014-06-08 23:00:57 -04:00
ZomgPonies
c7cf7650af Powerarmor fixins 2014-06-08 22:19:41 -04:00
ZomgPonies
2c709df1da Bugfixins 2014-06-08 22:04:16 -04:00
ZomgPonies
32e0776b2d Merge pull request #245 from BobTheBoss64/master 
Zippo sound effects and spelling fixes
 2014-06-08 21:56:17 -04:00
ZomgPonies
2c57ec96ae First commit of the addiction system 2014-06-08 21:55:03 -04:00
SparklySheep
96fbad479c Removes Impedrezene from the Paralysis Pen 
Because random brain damage from a pen is terrible, especially if you're trying to extract information from the person.
 2014-06-08 18:30:56 -04:00
GinjaNinja32
0fc144ed35 Fix xenoarcheology field generator 2014-06-08 18:30:37 -04:00
Hubblenaut
f3df5a4a8a Probability to bleed by airflow_hit lowered from 100% to 33% 2014-06-08 18:30:01 -04:00
Hubblenaut
544ff5f106 Fixes suit icons not updating when bloodied by airflow 2014-06-08 18:29:19 -04:00
ZomgPonies
e3d2a1716d Fix syndi helmets thanks PPI 2014-06-08 18:18:14 -04:00
Erthilo
26a4b0a816 Missed some files. 
Conflicts:
	icons/mob/species/vox/gloves.dmi
	icons/mob/species/vox/suit.dmi
 2014-06-08 18:14:12 -04:00
Erthilo
dfce6736fb Tons more vox clothes. 
Conflicts:
	code/modules/clothing/gloves/miscellaneous.dm
	code/modules/clothing/masks/breath.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/suits/labcoat.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/species.dm
	icons/mob/mask.dmi
	icons/mob/species/vox/masks.dmi
	icons/mob/species/vox/shoes.dmi
	icons/mob/species/vox/uniform.dmi
 2014-06-08 18:13:22 -04:00
Erthilo
ee56d75f52 Bandage Typos. 2014-06-08 17:38:06 -04:00
Erthilo
1d539848fa Prevents diona nymph spam. 
Conflicts:
	code/game/machinery/podmen.dm
 2014-06-08 17:30:07 -04:00
nyanpasu
4aad7c1738 Modified power monitor to output to a formatted table. 
Conflicts:
	code/game/machinery/computer/power.dm
 2014-06-08 17:27:28 -04:00
Michael Slettevold
57eed9777c Added sound effect for opening and closing Zippo lighters. 
Corrected spelling of "independent", for flagprocs.dm.
 2014-06-08 14:17:37 -07:00
Erthilo
d3eeb7945d Hotfix for Zombie Powder not ever clearing Fakedeath. 2014-06-08 16:24:48 -04:00
d3athrow
a271304044 Fix a runtime that occurs from closing the Clothing menu on a human. 2014-06-08 16:24:21 -04:00
Aranclanos
23387777c2 Ian will stop making the MC wait for his movements 
Conflicts:
	code/modules/mob/living/simple_animal/friendly/corgi.dm
 2014-06-08 16:23:17 -04:00
ZomgPonies
8ad505e18c Added abandoned drug lab to map. 2014-06-06 16:00:53 -04:00
ZomgPonies
4cfeada9d7 Added baggies for drugs, aww yeah 2014-06-06 04:16:39 -04:00
ZomgPonies
b23b5b62d9 Made hyperzine same color as salt, because HAHA 2014-06-06 02:43:38 -04:00
ZomgPonies
489cdf0096 Made hyperzine harder to make properly. 2014-06-06 02:35:10 -04:00
ZomgPonies
f370d92dfa Boop 2014-06-06 00:45:10 -04:00
ZomgPonies
710f44bc55 Fix borg stunbatons 2014-06-06 00:06:28 -04:00
ZomgPonies
0d57c3ef4d Tune bag choking 2014-06-06 00:06:17 -04:00
Zuhayr
dc344d3d51 Update drone.dm 
Typo fix and message trim fix.
 2014-06-05 22:19:55 -04:00
ZomgPonies
4683a12a35 Fix for storage bags 2014-06-05 22:17:01 -04:00
ZomgPonies
751c3badd1 Added powerarmor to RnD 2014-06-05 22:09:32 -04:00
ZomgPonies
caaf56dbcc Bugfix for bag choking 2014-06-05 17:09:27 -04:00
Rob Nelson
0762e137ab Fix safe...? 
Conflicts:
	code/game/objects/objs.dm
 2014-06-05 16:21:26 -04:00
Rob Nelson
5649e2c34d Optimize the fuck out of using checks in machines. 2014-06-05 16:16:27 -04:00
Hubblenaut
784461540e Fixes setting internals on belt- and suit storage slots being ignored 2014-06-05 16:10:33 -04:00
Hubblenaut
31ca257cd2 Fixed an issue with IBs being almost twice as bad 
Conflicts:
	code/modules/organs/organ_external.dm
 2014-06-05 16:10:17 -04:00
Jeremy Liberman
b9f40d1b71 Rephrase text based on code review 2014-06-05 16:05:25 -04:00
Jeremy Liberman
33cd27e032 Prevents mindless candidates for mutiny mode, adds loyalists/mutineers to AntagHUD, allows admins to reassign heads, and adds remaining Directive X objectives to Check Antagonists panel. 
Conflicts:
	code/__HELPERS/names.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/mob.dm
	code/modules/mob/new_player/new_player.dm
 2014-06-05 16:05:09 -04:00
ZomgPonies
b9fe3ab514 Added choking people with plastic bags. 2014-06-05 04:43:30 -04:00