cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-22 16:12:36 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,017 Commits 2 Branches 1 Tag
080e526e9ee6ff8fb0f91ff8d0d86e3b133ff08b
Commit Graph

21008 Commits

Author SHA1 Message Date
Zuhayr
9f54a71c2c Limbs now copy hair data from their owner and may have optional body hair icons blended into them. 2015-08-31 16:34:13 +09:30
PsiOmegaDelta
f35e614150 Merge pull request #10958 from caelaislinn/emitter_fix 
Fixes emitter runtime by using new calling syntax
 2015-08-31 08:58:07 +02:00
Zuhayr
14c57fcf11 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/modules/mob/holder.dm
	icons/mob/head.dmi
 2015-08-31 16:17:24 +09:30
PsiOmega
af86b8a935 Ports LummoxJr's get_turf() 2015-08-31 08:45:20 +02:00
Cael Aislinn
1de511b545 fixes emitter runtime by using new calling syntax 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-31 16:41:43 +10:00
Joseph Heinemeyer
8c61c3ab6f Fixes multi-z things. 2015-08-30 18:58:37 -07:00
Zuhayr
ac04bdfb52 Readded monkey scooping. 
Conflicts:
	code/modules/mob/living/carbon/human/species/species.dm
 2015-08-31 07:01:56 +09:30
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
GinjaNinja32
491bb6931a Merge pull request #10944 from PsiOmegaDelta/150830-Cleanup 
Removes duplicate definitions.
 2015-08-30 19:18:53 +01:00
Neerti
067bfc0de5 Merge pull request #181 from Mark9013100/endondeath0 
Rounds no longer end on antag death
 2015-08-30 13:11:38 -04:00
Datraen
fa566fbe47 [Botany] Gas-related traits revealed on the plant analyzer 
http://baystation12.net/forums/threads/the-little-things-4-with-a-vengance.9/page-11#post-10909
 2015-08-30 11:58:39 -04:00
PsiOmega
0bd41e604b Merge remote-tracking branch 'upstream/dev' into Backup 2015-08-30 15:55:10 +02:00
PsiOmega
080e07976a Removes duplicate camera network definitions. 2015-08-30 15:51:05 +02:00
PsiOmega
6165b6fee3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/items/weapons/material/shards.dm
 2015-08-30 10:23:14 +02:00
PsiOmegaDelta
88250ad57f Merge pull request #10939 from Baystation12/master 
Dev-freeze
 2015-08-30 10:20:32 +02:00
Cael Aislinn
d41083cfae resolves issue with space and unsimulated turfs being odd and dark 
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
 2015-08-30 15:27:04 +10:00
Mark9013100
1d736b368e Rounds no longer end on antag death 2015-08-30 00:52:38 -04:00
Zuhayr
92d3e6d240 Fixes Yongauni#155 2015-08-30 11:45:54 +09:30
Chinsky
bfa54052f8 Merge pull request #10891 from Peliia/Peliia-patch-1 
Virology Tiny Fixes
 2015-08-29 23:27:15 +03:00
Chinsky
9edeb3cc08 Merge pull request #10908 from Matthew951/8-27-2015-adds-Volaju-hair 
Adds a new set of hair and facial hair
 2015-08-29 23:26:30 +03:00
PsiOmegaDelta
f707050c0f Merge pull request #10926 from Sligneris/patch-1 
"Junior Officer" alt-title
 2015-08-29 18:23:16 +02:00
PsiOmega
e1aa20fda5 Radio changes. 
Removes the radio free range option.
Instead all users can move within the standard radio frequency range, while authorized users can also select department channels.
 2015-08-29 17:12:48 +02:00
Atlantis
4189fc3ff6 Adds defines for atmospherics tanks values 2015-08-29 15:53:13 +02:00
PsiOmega
35ea424edc Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs 
Conflicts:
	code/modules/clothing/spacesuits/rig/rig.dm
 2015-08-29 10:06:18 +02:00
PsiOmega
22262507b9 Only living mobs now trigger shrapnel. 
Fixes issue with manually moving ghosts would step on shrapnel, with glass noise and all.
On dev this issue is expanded further as all known movements means use forceMove.
 2015-08-29 10:03:58 +02:00
Zuhayr
dfbdd79375 Merge branch 'dev-freeze' of https://github.com/Zuhayr/Baystation12 into dev 2015-08-29 16:53:42 +09:30
Zuhayr
7d82e4850e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 2015-08-29 16:53:07 +09:30
Mark9013100
1906000577 Removes duplicate line from detective file 2015-08-28 23:55:52 -04:00
Sligneris
8046fa0fb2 "Junior Officer" alt-title 
Adds "Junior Officer" as an alternative job title to Security Officers.

Pros:
- replaces "Security Cadet" as a title that signalizes lesser experience,
- opens up roleplay possibilities,
- gives no potential room for slot abuse,
- gives a reason for a character to make mistakes, allowing for some antag opportunities!

Cons:
- gives a reason for a character to make mistakes.
 2015-08-29 02:34:08 +02:00
Zuhayr
165f30b274 Merge pull request #10906 from PsiOmegaDelta/150827-RoundTime 
Alters the round duration format, increases Stat inactivity timeout.
 2015-08-29 07:41:23 +09:30
mwerezak
db8aefb121 Refactors duplicate parry code 2015-08-28 14:39:28 -04:00
Atlantis
601c525a4b Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into mapfixes 2015-08-28 20:38:04 +02:00
mwerezak
3e967872a3 Allows grabs to be resisted while weakened 2015-08-28 14:08:59 -04:00
Daranz
d5b618adac Fix Say ":i" working with intercoms, re-add restraint check for Say ":i" 
See also commits:
e9d9ff57ba
bbc8ad6383
b9dbeeb356
 2015-08-28 17:33:52 +02:00
PsiOmega
daef0ccec8 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-28 11:27:20 +02:00
PsiOmega
ff7a4fc244 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/events/event_container.dm
 2015-08-28 11:18:57 +02:00
Chinsky
c642e8c729 Merge pull request #10907 from PsiOmegaDelta/150827-AdminLogs 
Improved admin logging.
 2015-08-28 10:32:35 +03:00
PsiOmegaDelta
916530f3dc Merge pull request #10911 from GinjaNinja32/table-defines 
improve defines in table code
 2015-08-28 07:27:12 +02:00
GinjaNinja32
a286bd24b4 improve defines in table code 
the defines were inverted, this uninverts them
also fixes #undef of old names for things
 2015-08-28 00:12:18 +01:00
Matthew951
78a129db9d Adds a new set of hair and facial hair 
- Adds "Volaju" hair to sprite_accessories
- Adds "Volaju" facial hair to sprite_accessories
- Adds two new icons to human_face.dmi corresponding to the above
 2015-08-27 14:47:02 -04:00
GinjaNinja32
23f5581a35 Merge pull request #10894 from mwerezak/moderate-virus 
Makes moderate virus events one-shot
 2015-08-27 19:46:11 +01:00
PsiOmega
f68275d91b Improved admin logging. 
log_and_message_admins() (which sure needs a shorter name) now uses key_name_admin() instead of just key_name().
Replaces calls to admin_log_and_message_admins() which did this with log_and_message_admins() instead.
 2015-08-27 20:20:20 +02:00
PsiOmega
c5e09c30d6 Alters the round duration format, increases Stat inactivity timeout. 
Round duration now has a similar format to round time.
Stat inactivity timeout is now 10 minutes instead of 1 minute.
 2015-08-27 20:01:38 +02:00
PsiOmega
5873026915 Adds missing message assignment. Removes now unnecessary message formatting. 2015-08-27 19:35:44 +02:00
Peliia
8743cd89a4 Dish Incubator v2 
Adheres to pointers laid out by Ginja.
 2015-08-27 18:59:16 +02:00
PsiOmegaDelta
bf3040cc2d Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-08-27 09:01:50 +02:00
PsiOmegaDelta
d293b9ea25 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/ZAS/Controller.dm
	code/modules/admin/verbs/adminsay.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/stripping.dm
	code/modules/mob/living/carbon/human/update_icons.dm
 2015-08-27 08:53:22 +02:00
Atlantis
52d9f0ebc3 Fixes various turf/atmosphere issues 
- Fixes the fact atmospherics turfs started with only ~5000kPa of relevant gas in them. This was, espicially with nitrogen, insufficient to cover round usage which is in ten thousands.
- N2 tank starts at 90k kPa, O2 at 50k kPa, CO2 and Phoron tanks at 25k kPa and N2O tank at 10k kPa. This is a combination of original values and minor balancing (O2 and N2 is used in air mix so there's a lot of it, while others are less useful/limited to toxins use so they are likely not needed at such amount). These values were verified in-game and are accurate at 20C the gas mix starts on.
- Engine no longer starts hyperpressurised with nitrogen, in a way that somehow causes it to generate 80kW without anyone touching it at all, while using only 40-50kW for circulation and stuff.
- Engine reverted to 80kPa inert N2 atmosphere that's being used for months now and is on master. Unlike 5MPa nitrogen it doesn't prevent usage of different coolant type, and doesn't overpressurise the core.
 2015-08-27 07:40:18 +02:00
Zuhayr
9a23275755 Merge pull request #10893 from mwerezak/zonemerge-fix 
Backports fix for areas not venting when both airlock doors are forced open
 2015-08-27 07:09:50 +09:30
Zuhayr
701282d2b0 Merge pull request #10889 from PsiOmegaDelta/150826-AdjacentStripping 
Must now be adjacent to mobs you are stripping.
 2015-08-27 06:51:54 +09:30