cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,349 Commits 8 Branches 0 Tags
c1bd0aa6b45d2eecb14666f247773b74ed0f84aa
Commit Graph

23414 Commits

Author SHA1 Message Date
SinTwo
c1bd0aa6b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/clothing.dm
 2016-07-19 17:37:14 -04:00
SinTwo
b4f85ff533 cleanup and fixes 2016-07-19 17:25:45 -04:00
Mark9013100
67279bf012 Allows belts to hold all tape rolls 2016-07-18 22:24:18 -04:00
SinTwo
cf45a827a9 final cleanup 2016-07-18 16:03:53 -04:00
Jon
31e66c0037 Fixes vomiting. 2016-07-18 19:12:12 +01:00
Spookerton
3fa5a109a4 Removing hub password for delisting. 
Kill meeeeee.
 2016-07-18 01:24:53 +01:00
EmperorJon
910ce2f584 Merge pull request #2144 from Neerti/7/16/2016_teshari_fix 
Teshari Now Have Upper Bodies
 2016-07-17 09:37:40 +01:00
Anewbe
9cfc9222d6 Corrects the way stunbatons check for charge on attack 2016-07-16 23:05:06 -05:00
Neerti
9483f5b231 Merge pull request #2143 from Anewbe/wring_of_drones 
Fixes grammar error
 2016-07-16 23:28:15 -04:00
Neerti
ef8a9dd5e0 Teshari Now Have Upper Bodies 
Fixes a long standing bug.  Turns out BP_CHEST is undefined and the compiler never caught it for some reason.
 2016-07-16 23:26:23 -04:00
Anewbe
217713d306 Fixes grammar error 2016-07-16 21:29:02 -05:00
EmperorJon
d533ef743b Merge pull request #2134 from Neerti/7/14/2016_accuracy_penalties 
Adds accuracy penalties for certain detrimental states.
 2016-07-16 17:04:38 +01:00
EmperorJon
1476f525f7 Merge pull request #2139 from Neerti/7/15/2016_more_technomancer 
Some More Technomancer Additions
 2016-07-15 20:30:20 +01:00
Neerti
63857919ac Revert "De-pubifies the server" 2016-07-15 12:24:23 -04:00
Neerti
b93bf797f4 Some More Technomancer Additions 
Adds the Recycling and Summoner cores to the catalog, which I somehow forgot to do earlier.
Adds an instability modifer for different cores.
Adds several new healing spells, for dealing with internal organ troubles, as well as for dealing with robotic FBP healing.
Makes various healing spells cheaper in the catalog.
 2016-07-15 12:18:31 -04:00
Anewbe
4e25ac5187 Fixes bashing doors 2016-07-15 09:33:22 -05:00
Neerti
ba33340ce0 Merge pull request #2099 from Anewbe/tricord_nerf 
Halves the effect of Tricordrazine
 2016-07-15 07:07:14 -04:00
Neerti
666d56d794 Merge pull request #2131 from Anewbe/meatier_limbs 
Increases the amount of damage limbs can take
 2016-07-15 07:04:59 -04:00
Neerti
653f120c0d Merge pull request #2089 from Anewbe/salt_carbine 
Removes Assault Carbine from uplink
 2016-07-15 07:04:49 -04:00
Neerti
728cd2bdd3 Adds accuracy penalties for certain detrimental states. 
Being blind gives an additional 75% chance to miss.
Having blurry eyes gives an additional 15% chance to miss.
Being confused gives an additional 30% chance to miss.

This was done so that if the PR for flashes to apply these effects instead of a stun are merged, they would hopefully still be useful if someone is trying to robust you.  Melee and ranged penalties should be equivalent, despite different numbers due to how the different code works.
 2016-07-14 06:19:49 -04:00
Datraen
a1e278e978 Fixes #1144 
Parses text rather than saving icon strings. Might be better to save the strings in the future into variables, done at the toggle level for custom items.
 2016-07-13 21:59:34 -04:00
SinTwo
918e65b7b9 finished clothes (mostly) 2016-07-13 21:39:42 -04:00
Anewbe
d991c360d3 Increases the amount of damage limbs can take 2016-07-13 18:58:39 -05:00
Neerti
f9bf949098 Merge pull request #2120 from Anewbe/organ_split 
Splits internal organs into separate files
 2016-07-13 19:56:42 -04:00
Neerti
7df5bfded4 Merge pull request #2130 from Anewbe/ling_icons 
Adds icons to the ling HUD
 2016-07-13 19:47:22 -04:00
Anewbe
0325a2a5e6 Fixes a spelling mistake 2016-07-13 18:27:00 -05:00
Neerti
b0321958d1 Merge pull request #2115 from Yoshax/ED-Emag 
Ensures security robots can be properly emagged
 2016-07-13 19:14:23 -04:00
Neerti
9ac2ad0b86 Merge pull request #2113 from Yoshax/randomitems 
Random item clean up, adjustment and addition
 2016-07-13 19:11:50 -04:00
Neerti
f3cb92d327 Merge pull request #2110 from Anewbe/tox_buff 
Speeds up toxin
 2016-07-13 19:11:01 -04:00
Neerti
d7a9a4339c Merge pull request #2116 from Yoshax/droppods 
Refactors the drop pod contents to make them a tad more useful and in general more iteresting
 2016-07-13 19:10:28 -04:00
Anewbe
bc1d661ae8 Adds icons to the ling HUD 2016-07-13 18:05:46 -05:00
Yoshax
517dd50038 Merge pull request #2128 from Neerti/7/13/2016_younger_synths 
Allows FBPs to potentially have different age limits.
 2016-07-13 23:53:22 +01:00
Neerti
19779d8e0e Merge pull request #2112 from Anewbe/jobs_age 
Adds player age req to Chemist and Atmos
 2016-07-13 18:49:50 -04:00
Neerti
6e281def77 Allows FBPs to potentially have different age limits. 
Cyborgs have their minimum be equal to their species' minimum, and maximum be their species maximum plus twenty years.
Posibrains have a minimum of 1, and a maximum of 220, as discussed by EmperorJon.
Digital brains (drones) have a minimum of 1 and maximum of 150, as discussed by Spookerton.
 2016-07-13 18:25:07 -04:00
SinTwo
976847a0b4 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into item_state 
Conflicts:
	code/modules/clothing/head/jobs.dm
	icons/mob/items/lefthand.dmi
	icons/mob/items/righthand.dmi
	icons/mob/suit.dmi
	icons/mob/uniform.dmi
	icons/obj/items.dmi
 2016-07-13 17:07:52 -04:00
SinTwo
1a400eb2cb pre-merge commit 2016-07-13 16:18:58 -04:00
Yoshax
fd9e8616e3 Ensure laser warfare drop pod has laser proof armor 2016-07-13 20:10:44 +01:00
Yoshax
dc7f0d6434 Merge pull request #2126 from Neerti/7/13/2016_health_hud_fix 
Health Hud Prosthetics Fix
 2016-07-13 20:07:16 +01:00
Neerti
bfd838fd5c Health Hud Prosthetics Fix 
Adds two lines of code I forgot to port, hopefully should make the prosthetic icons for the HUD be correct now.
 2016-07-13 14:46:21 -04:00
Neerti
334f24730e Merge pull request #2124 from Yoshax/hair 
Adds a new hairstyle
 2016-07-13 14:41:46 -04:00
Neerti
eeb234cf2a Merge pull request #2114 from Yoshax/CargoConsoleFix 
Ensures cargo consoles can be properly emagged
 2016-07-13 14:40:06 -04:00
Neerti
e5d24b1655 Merge pull request #2125 from Yoshax/runtimefi 
Fixes 3 runtimes due to a null
 2016-07-13 14:39:11 -04:00
Neerti
f2e0462dcb Merge pull request #2123 from Yoshax/languages 
Makes languages great again
 2016-07-13 14:38:33 -04:00
Yoshax
f86cbfd6df Fixes a runtime due to a null 2016-07-13 18:39:44 +01:00
Yoshax
f2f6ca54f2 Adds a new hairstyle 2016-07-13 18:34:46 +01:00
Yoshax
402e046576 Fixes languages not being properly added to mobs 2016-07-13 18:12:15 +01:00
Yoshax
cda6508001 Merge pull request #2119 from Anewbe/burning_bodies 
Burning bodies no longer burn forever
 2016-07-13 17:13:16 +01:00
Yoshax
3df18c2870 Merge pull request #2111 from Serithi/LAVENDER_UNBORKIFICATION 
Properly alphabetizes lavender in the vending machines.
 2016-07-13 17:10:10 +01:00
Anewbe
7946349294 Splits internal organs into separate files 2016-07-12 22:32:09 -05:00
Anewbe
b08ddfefff Fixes lighters being able to ignite people while off. 2016-07-12 22:13:04 -05:00