cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 09:03:05 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,469 Commits 2 Branches 1 Tag
e9772faabcff4eac867226084d884a777aa3b51d
Commit Graph

574 Commits

Author SHA1 Message Date
Ccomp5950
67bf27e6f4 Merge pull request #5602 from Hubblenaut/food 
Grid Placement for Food
 2014-07-15 01:22:47 -05:00
Hubblenaut
c920b0234f Renames CoM into center_of_mass 2014-07-14 23:13:46 +02:00
Whitellama
a6b4f5d2aa Fixed issues with cans complaining twice when trying to drink unopened and with transfering fluids between closed cans 2014-07-13 23:23:26 -07:00
Hubblenaut
b7778ff420 Fixes merge conflict 2014-07-13 21:35:31 +02:00
Hubblenaut
31637edf76 Introduces function for exact item placement of food and applies it to each food item in the game 2014-07-13 19:37:33 +02:00
mwerezak
c0487b9c90 Fixes human internal organs list 2014-07-12 16:15:37 -04:00
Zuhayr
f477012ab8 Merge pull request #5533 from mwerezak/wound-infections 
Fix for #5532 and the last of the infection changes, I hope
 2014-07-09 19:28:00 +09:30
Mloc
c7b2aefdc7 Merge pull request #5534 from Hubblenaut/master 
Fixes painkillers leaving the body way too fast and adds minor feature to health analyzers
 2014-07-09 10:41:22 +01:00
mwerezak
5e56d09512 Sterilizine reduces germ_level on contact 2014-07-08 18:57:07 -04:00
Hubblenaut
d6caeb79d6 Fix: Painkillers stay in body for decent time 2014-07-08 02:47:37 +02:00
Hubblenaut
38ac5ece7c Health Analyzer can read all types of beneficial medicine 2014-07-08 02:09:53 +02:00
mwerezak
cb0437ecca Fixes reagent_containers not being usable for surgery 2014-07-06 15:37:05 -04:00
Hubblenaut
dfece9fe12 Stops buckled mobs from slipping (for now) 2014-07-02 22:36:49 +02:00
Mloc-Argent
6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm
 2014-06-30 23:44:46 +01:00
Zuhayr
b50d42d80c Cleaned up some reagent stuff, made Skrell alcoholics a legit issue, fixed IPC getting phoron contamination from clothing. 2014-07-01 01:03:50 +09:30
Ccomp5950
1ba345ca8c Teacup icon clipping fix. 
Might need to be done to coffee as well.

Thanks Serveris6 for the report:  http://prntscr.com/3wyah5
 2014-06-27 02:29:45 -05:00
Chinsky
4cd4217488 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge 
Conflicts:
	code/modules/organs/organ_external.dm
 2014-06-24 04:22:28 +04:00
Chinsky
3ff6c41846 Made monkey cube subtypes define what type of monkey they spawn instead of weird switch in Expand(). 
Rewrote belly expanding accordingly. Also now you get a living monkey from the monkey.
 2014-06-24 04:19:09 +04:00
Chinsky
ece48ae0c4 Moved same code into single organ helper to handle embedding. 2014-06-24 04:09:35 +04:00
Chinsky
b2b9907605 Lowers caused damage to make it destroy organs rarer. 2014-06-24 03:56:34 +04:00
Chinsky
e3930fa79e Monkey cube now expand when eaten, leading to !!FUN!! 2014-06-24 03:42:23 +04:00
Mloc-Argent
a33cb7272b Merge remote-tracking branch 'upstream/master' into dev 2014-06-23 20:57:47 +01:00
Zuhayr
65013ac5a1 Merge pull request #5325 from mwerezak/temperature-expose 
Fixes FEA temperature_expose() being used instead of ZAS fire_act().
 2014-06-23 00:19:15 +09:30
Mloc-Argent
191e21ead6 atmos: fix everlasting fires 
Fires were checking against a non-reduced air sample for existance, so
the reduced sample wasn't working in zburn when it failed the check.
Also fixed volatilefuel not being scaled in the phoron reagent.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2014-06-22 15:25:23 +01:00
Zuhayr
1cfb9b6ea1 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-22 21:58:46 +09:30
Zuhayr
183ee20ab6 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-06-22 21:58:30 +09:30
Zuhayr
bb8951a53c Makes forks usable. 2014-06-22 21:49:55 +09:30
Mloc
af60005aad Merge pull request #5317 from comma/master 
Couple o fixes
 2014-06-22 11:13:29 +01:00
mwerezak
37e63dfcb0 Fixes FEA temperature_expose() being used... 
...instead of ZAS fire_act().
 2014-06-22 00:13:22 -04:00
Chinsky
15536d27a4 Fixes #5264 
Viruses are properly transferred to spilled blood now.
Antigens prevent from infection properly.
Lowered frequency of blood puddle virus check to cut down on processing.
 2014-06-21 17:52:59 +04:00
Ccomp5950
68d01b00ab Merge pull request #5297 from comma/fancy 
Nextgen lights
 2014-06-20 20:30:11 -05:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
 2014-06-20 22:02:40 +01:00
Chinsky
ceecd7abc9 Changed color mixing to use weighted average instead of addition. Should help against values reaching FF too fast. 
Adjusted color mixing helper to use inbuilt procs.
 2014-06-18 23:45:25 +04:00
mwerezak
5a3c7dc432 Fixes human/checkarmor getting the armour... 
...value for the wrong body part.

Whoever put ran_zone() in there wasn't thinking straight, as it's not
going to affect the part that actually gets damaged.
 2014-06-18 10:05:04 -04:00
Wouter
580547f924 Adds ..() on Chem Masters 
This makes sure they use power, and don't work when the power is out, beside making sure functions work correctly. As they didn't on my (adapted) code.
 2014-06-18 03:46:31 +02:00
Chinsky
be95e54e43 Merge branch 'master' into dev 
Conflicts:
	code/defines/obj/weapon.dm
	code/modules/mob/living/carbon/species.dm
	code/modules/mob/living/silicon/say.dm
	icons/mob/uniform.dmi
	maps/tgstation2.dmm
 2014-06-17 16:16:44 +04:00
mwerezak
1b33ca943d Separates the sharp flag into edge and sharp 
Now weapons can properly cause cuts without necessarily having a greater
chance to remove limbs.

Also separates is_sharp, has_edge, and can_puncture.
 2014-06-15 20:25:39 -04:00
Chinsky
6d432d8e9d Merge pull request #5219 from Zuhayr/autolathe 
Autolathe rewrite.
 2014-06-12 20:28:44 +04:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup 
Cleans up get_turf_loc()
 2014-06-12 18:13:01 +09:30
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
Zuhayr
4ee8f56c29 Merged master to dev, manually fixed merge issues in map, may be some left. 2014-06-11 18:11:41 +09:30
Zuhayr
c841db56b6 Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev 2014-06-11 09:24:28 +09:30
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf() 
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
 2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
sick-trigger
027514c6f3 Feed other text fix 
Fixes #5199
 2014-06-10 10:37:43 +10:00
Zuhayr
c2f2a7cde6 Refactored material definitions a little bit, removed all bananium from the codebase. 2014-06-08 00:40:34 +09:30
sick-trigger
aecf06028e Painkillers leave body correctly 
Tramadol, paracetamol and oxy will now leave a mob's body. Fixes #5150.
 2014-06-05 18:09:18 +10:00
Zuhayr
1e135f91af Merge resolution with master. 2014-06-02 12:05:12 +09:30
Zuhayr
5f98ccaaf8 Added smaller spraybottle for drones. 2014-05-31 22:15:28 +09:30
Mloc-Argent
ee2e68960a Merge remote-tracking branch 'upstream/master' into dev-freeze 
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/cloning.dm
	code/modules/admin/admin_verbs.dm
 2014-05-31 00:17:56 +01:00