cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-24 17:11:40 +00:00
Code Issues Packages Projects Releases Wiki Activity
33,579 Commits 2 Branches 1 Tag
7e69bafa539c0ea3e5c7cb15a1d65932165841c4
Commit Graph

1344 Commits

Author SHA1 Message Date
Datraen
4c0bd923c3 Merge pull request #866 from Kelenius/viroRemoval 
Removes the old virus system
 2016-02-05 21:06:09 -05:00
Zuhayr
408cb5d8d8 Adds a coverage check to xenoflora splattering, adjusts brainloss across 
the board.
 2016-01-31 11:49:14 +10:30
Zuhayr
f31438bd77 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bayupdate 2016-01-30 08:49:35 +10:30
Kelenius
6de7243862 Fixes #120 2016-01-27 13:30:13 +03:00
Kelenius
b86c730695 Removes the old virus system 
Appendicitis moved to appendix organ
 2016-01-27 11:44:41 +03:00
Zuhayr
1c100bf457 Cleaning up post-merge. 2016-01-22 01:22:49 +10:30
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Hubblenaut
39cdd540fe Center_of_mass for snacks/dishes 2016-01-16 19:45:17 +01:00
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Hubblenaut
42b7acea8b Merge remote-tracking branch 'upstream/master' into coffee 2016-01-13 02:19:22 +01:00
Hubblenaut
721728d3dd Adds porcelaine cups 2016-01-12 19:42:43 +01:00
Zuhayr
40b7c087c9 Attempting to fix perma-wet-floors bugs. 2016-01-12 15:50:20 +10:30
Zuhayr
905cb5943d Readds blindness removal to imida 
zoline and organ surgery. Stops imidazoline healing robotic eyes.
 2016-01-09 13:24:46 +10:30
Hubblenaut
f4fe6daf3d Adds sugar dispensers 2016-01-02 15:32:51 +01:00
Hubblenaut
e5de78b647 Adds coffee dispenser 2016-01-02 15:32:48 +01:00
GinjaNinja32
9dee0707e8 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-24 15:06:16 +00:00
Zuhayr
f93ea6a78f Tweaks to previous commits. 
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
 2015-12-24 21:13:40 +10:30
Zuhayr
d71573e749 Further work on properly integrating, updating and fixing prosthetic options. 
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
 2015-12-24 21:10:33 +10:30
GinjaNinja32
9c267539a3 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-22 02:55:31 +00:00
PsiOmegaDelta
5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
 2015-12-20 11:22:08 +01:00
Spamcat
a515f0469a Wrenched opwn welding tanks now explode when exposed to fire. 
#11537
 2015-12-16 17:59:05 +03:00
Neerti
33f85b8b88 Makes radiation medication not actually irradiate you worse. 2015-12-15 22:25:49 -05:00
GinjaNinja32
e068a689e3 tweak power cost 2015-12-14 23:13:17 +00:00
GinjaNinja32
53905d3669 add chemical regeneration to cartridge dispensers, remove energy dispensers 2015-12-14 23:01:45 +00:00
Neerti
e3bf3483c8 Merge pull request #559 from Yoshax/master 
Adjusts the death-whiskey
 2015-12-13 21:28:09 -05:00
Neerti
2aaa4e9a5e Merge pull request #525 from Zuhayr/qol 
Porting various QOL from Bay.
 2015-12-13 21:25:43 -05:00
Yoshax
1eb91b3144 Adjusts the death-whiskey 2015-12-13 22:46:42 +00:00
PsiOmegaDelta
f382626075 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/asteroid.dm
	code/game/verbs/ooc.dm
	code/modules/admin/verbs/icarus.dm
	code/modules/mob/living/silicon/robot/robot_items.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/random_map/random_map.dm
	code/setup.dm
 2015-12-13 10:15:29 +01:00
Yoshax
48dcb85b44 Makes the mythical special blend whiskey real 2015-12-13 03:31:36 +00:00
Zuhayr
793bc18efd Mops can now be wet in buckets or sinks. 2015-12-11 15:54:56 +10:30
Zuhayr
2edf2c499f POCKET SAND! 2015-12-11 15:53:40 +10:30
GinjaNinja32
0f2b17f7bb fix #11631 2015-12-10 13:01:06 +00:00
Zuhayr
565e39a28f Porting forensics from Aurora. 2015-12-10 19:16:28 +10:30
PsiOmegaDelta
5fcf13ac55 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/weapons/surgery_limbattachment.dm
	code/modules/mob/living/carbon/human/human_defense.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/organs/organ.dm
	code/modules/organs/organ_external.dm
	code/setup.dm
 2015-12-08 08:09:37 +01:00
Zuhayr
c2eba995ac Merge pull request #11604 from mwerezak/organ-tag-fix 
Organ fixes
 2015-12-07 19:13:09 +10:30
PsiOmegaDelta
6a22086c17 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/verbs/suicide.dm
	code/modules/nano/modules/crew_monitor.dm
 2015-12-06 11:34:36 +01:00
mwerezak
9135a609cb Replaces most instances of if(E & ORGAN_DESTROYED) with if(E.is_stump()). Fixes #11468 2015-12-06 04:17:52 -05:00
mwerezak
2312631508 Fixes #11510 
Splashing and external transfer now checks if the container is open
 2015-12-06 02:49:46 -05:00
Yoshax
db7af654ec Adds checks to ensure target is valid, adds user feedback 2015-12-05 15:10:10 +00:00
Yoshax
4c201d8219 Adds ability to smash bottles on things other than people's heads 2015-12-05 14:22:40 +00:00
SinTwo
8d747eed8d Moderator Logs 2015-11-29 13:34:00 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge 
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
 2015-11-06 17:41:18 -05:00
PsiOmegaDelta
3dcd35508f Compilation fixes. 2015-10-27 13:43:30 +01:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
 2015-10-27 13:08:33 +01:00
PsiOmegaDelta
dd855b5259 Compilation fixes. 2015-10-27 12:47:35 +01:00
PsiOmegaDelta
3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
 2015-10-27 12:38:28 +01:00
Chinsky
35ce07aa71 Merge pull request #11296 from mwerezak/pepperspray-fix 
Pepperspray and chem smoke fixes
 2015-10-26 05:42:59 +03:00
PsiOmegaDelta
e37394e8fa Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/modules/mob/living/carbon/human/human_helpers.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
 2015-10-25 20:28:48 +01:00
PsiOmegaDelta
7d4f51be8e Merge pull request #10287 from mwerezak/attack-cleanup2 
Refactors item attack click and mob melee attack handling code
 2015-10-25 08:43:47 +01:00