cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-21 23:52:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,372 Commits 2 Branches 1 Tag
24f7c0ca2cac15f9aa55e32b50ec4162d563dfb3
Commit Graph

22674 Commits

Author SHA1 Message Date
EmperorJon
3c0ae200c8 Merge pull request #423 from EmperorJon/04_Dec._Merge_synth_access_fix 
Object access check fix.
 2015-12-04 19:08:43 +00:00
PsiOmegaDelta
11904bd805 Object access check fix. 
Objects now only check synth access as intended, instead of the more restrictive allowance.
Fixes https://github.com/PolarisSS13/Polaris/issues/409.
 2015-12-04 18:42:52 +00:00
EmperorJon
25d4387f50 Merge pull request #420 from Hubblenaut/master 
Fixes stack creation logic and return value
 2015-12-04 15:13:01 +00:00
Yoshax
4cf4aa6cb4 Fixes residential being residental 2015-12-04 14:57:49 +00:00
Hubblenaut
470d2bb54a Fixes stack creation logic and return value 2015-12-04 15:49:31 +01:00
Zuhayr
6997361c3c Merge pull request #11586 from PsiOmegaDelta/151204-AwfulWizards 
Corrects Wizard spell overlay positioning.
 2015-12-05 00:50:56 +10:30
Zuhayr
834f86241a Alters an unEquip() conditional in Give(). 2015-12-05 00:49:35 +10:30
PsiOmegaDelta
4d8ff90857 Wizard spell Destroy() additions. 
Backport of #11586. Fixes #11555.
 2015-12-04 09:48:46 +01:00
Chinsky
939c1a3146 Merge pull request #11376 from NullSnapshot/dev-freeze 
Bunch of IPC fixes.
 2015-12-04 11:28:25 +03:00
PsiOmegaDelta
67ba794f0c Corrects Wizard spell overlay positioning. 
Includes some Destroy() cleanup.
Fixes the rest of  #11583. Fixes #11555.
 2015-12-04 09:15:42 +01:00
NullSnapshot
c946ca7468 cleaning up recharge station's go_in proc by implementing a helper. 2015-12-04 00:05:00 -08:00
Zuhayr
398541f4eb Amendments. 2015-12-04 18:14:40 +10:30
Zuhayr
0cf5a709d1 Refactored give(). 2015-12-04 17:58:53 +10:30
Zuhayr
7c85f846eb put_in_hands() refactor. 2015-12-04 17:38:58 +10:30
Zuhayr
fd59c3ad76 More tweaks to IPC fixes. 2015-12-03 22:56:19 -08:00
Zuhayr
5561964204 Tweaks to previous commits. 2015-12-03 22:56:19 -08:00
Neerti
69efa14405 Merge pull request #416 from PolarisSS13/12/3/2013_round_end_time_reduction 
Reduces round-end timer from five to three minutes.
 2015-12-04 01:49:27 -05:00
MagmaRam
e7952d2334 Halves light necessary for diona to live 
Halves the amount of light diona need to feed/maintain health/whatever.
Shouldn't affect the rate at which they do these things, it should only touch
the rate.
 2015-12-03 23:20:12 -06:00
GinjaNinja32
56392affe5 Merge pull request #11557 from PsiOmegaDelta/151202-SecureEmagging 
Fixes being unable to emag secure closets.
 2015-12-04 05:14:45 +00:00
Neerti
b05b34c8e7 Merge pull request #414 from MagmaRam/disposals_fix 
Fix for disposal pipes not vanishing under floors.
 2015-12-03 22:36:06 -05:00
Neerti
5333ba66af Reduces round-end timer from five to three minutes. 2015-12-03 22:34:34 -05:00
Earthcrusher
61c8140c01 My first contribution to Polaris! Adds a few new brands of cigarettes to vending machines. 2015-12-03 21:20:11 -06:00
Merchoven
5b3dadfe69 Fix for disposal pipes not vanishing under floors. 
This is a fix for issue #291. Disposals pipes should now properly stop
displaying when a floor is placed on top of them.
 2015-12-03 21:03:46 -06:00
Mark9013100
6e0b906e23 Adds Security/Medical cargopacks. 2015-12-03 20:22:12 -05:00
SinTwo
6c59f7f6ff Merge branch 'master' of https://github.com/PolarisSS13/Polaris into sin2clothes 2015-12-03 18:29:05 -05:00
SinTwo
700ee6177b Clothes Addition, Captain alt title, custom loadout tweakes. 2015-12-03 18:25:45 -05:00
EmperorJon
1a1873d8b3 Merge pull request #410 from EmperorJon/03_Dec._Add_area_base_turf 
Allows you to define a base turf for an area
 2015-12-03 22:59:39 +00:00
Jon
1a94dea2ea Allows you to define a base turf for an area which overrides the z-level's base turf in unsorted.dm. 
It will first check to see if the turf is set, and if not it will still use the z-level default.
This means we can mark areas as having a base of space to override the z-level base of asteroid that we're using.
As a result, we can ensure the bombs, shuttles moving, etc. leave behind an space turf by defining shuttles, solars/"external" areas as using space as a base.
Areas will need to be updated to check with base_turf = /turf/space and references to the old get_base_turf proc updated so all calls (bombs, Nar'Sie, deconstruction, etc.) have the correct effect, but it's tired and I want to commit this now so I'm committed to finishing it tomorrow.
 2015-12-03 22:51:15 +00:00
PsiOmegaDelta
cc72f82371 Backports NanoUI fixes from dev. 
Fixes #11579.
 2015-12-03 21:50:24 +01:00
Neerti
c137d40484 Makes stating laws over binary work again. 2015-12-03 14:16:01 -05:00
Neerti
58149b8f4d Replaces :b with #b whenever a synthetic mob joins the game. 2015-12-03 14:02:56 -05:00
Neerti
2b1ff40189 Merge pull request #407 from Neerti/12/3/2015_exodus_from_the_exodus 
Removes most references of NSS Exodus.
 2015-12-03 13:54:29 -05:00
Neerti
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -05:00
Neerti
e528bb13cb Removes references to Lesser Form, a power that no longer exists. 2015-12-03 13:26:50 -05:00
Neerti
de8db6f909 Merge pull request #405 from Neerti/12/3/2015_psi_is_most_ideal_fixes_handcuffs 
Fixes handcuffs.
 2015-12-03 13:10:35 -05:00
SinTwo
c9db7fdab1 Fixes Voidsuit Helmets 2015-12-03 12:48:53 -05:00
PsiOmegaDelta
2d39621801 Makes it possible to ignore some incapacitation checks. 
This fixes  #11576. Also corrects the viewers() usage in visible_message.

Conflicts:
	code/__defines/mobs.dm
	code/modules/mob/living/carbon/resist.dm
 2015-12-03 12:37:30 -05:00
Neerti
42bb4aee39 Merge pull request #398 from Neerti/12/2/2015_round_end_salt_mine 
Makes round-end last five minutes instead of one.
 2015-12-02 21:04:46 -05:00
Neerti
7d1e3c63ab Merge pull request #399 from MagmaRam/clonerfix 
Fixes the bug where cloners would spawn corpses
 2015-12-02 17:08:19 -05:00
Merchoven
7f9f6cf8e3 Fixes the bug where cloners would spawn corpses 
Cloners spawned new clones with enough brain damage to kill them instantly.
I toned down the brain damage done to fix this.
 2015-12-02 13:03:04 -06:00
Neerti
79c5f4a1a8 Makes a line more readable. Thanks GinjaNinja32. 2015-12-02 13:22:14 -05:00
Neerti
b002a75539 Makes round-end last five minutes instead of one, with a per-minute countdown. 2015-12-02 12:32:28 -05:00
Neerti
29ae1073dd Merge pull request #395 from Hubblenaut/master 
Fixes camera repair
 2015-12-02 11:40:14 -05:00
Neerti
55107fa50c Merge pull request #381 from EmperorJon/Branch_01_Dec._Fix_hemostat_surgery 
Fixes hemostat surgery
 2015-12-02 10:11:12 -05:00
PsiOmegaDelta
ba423361bd Updates macro/span use. 2015-12-02 15:00:58 +00:00
PsiOmegaDelta
7ef07aeca6 Fixes hemostat surgery. 
Port of https://github.com/PolarisSS13/Polaris/pull/381.

# Conflicts:
#	code/modules/surgery/organs_internal.dm
#	code/modules/surgery/robotics.dm
#	code/modules/surgery/surgery.dm
#	polaris.dme
 2015-12-02 14:42:41 +00:00
Hubblenaut
a0e0f235ab Fixes camera repair 2015-12-02 15:35:27 +01:00
Neerti
e0986cb7ab Ballistic weapons will now correctly say that the firing mode was changed. 2015-12-02 08:04:34 -05:00
Neerti
d50e2afae9 Merge pull request #387 from Neerti/12/2/2015_fuck-dream-maker-for-its-horrible-search-abilities-because-i-broke-armor-god-damn-how-hard-is-it-to-look-up-if(armor 
Fixes armor making melee combat utterly useless.
 2015-12-02 06:39:39 -05:00
Neerti
c0412094f6 Fixes armor making melee combat utterly useless. 2015-12-02 06:30:20 -05:00