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
27,351 Commits 2 Branches 1 Tag
71d1853ede620b73fc3b9ddbe80ef7bd50ebf93a
Commit Graph

12540 Commits

Author SHA1 Message Date
Chinsky
71d1853ede Merge pull request #10993 from Zuhayr/species 
Human subspecies.
 2015-09-06 04:25:21 +03:00
GinjaNinja32
348f678b81 Merge pull request #10997 from PsiOmegaDelta/150904-RadioAccess 
Observers can now view radio settings, admins can alter them.
 2015-09-05 16:59:42 +01:00
Zuhayr
f8bf428e66 Merge pull request #10981 from comma/technoir 
MrSnapwalk's Detective Uniform Resprite
 2015-09-06 00:48:50 +09:30
Zuhayr
3e015d7c71 Added three human subspecies. 2015-09-06 00:39:08 +09:30
Zuhayr
808bbee90f Added species vars for oxy/tox/rad/flash resistance. 2015-09-06 00:39:05 +09:30
PsiOmega
95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm
 2015-09-05 09:35:02 +02:00
PsiOmega
69fde6af03 Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/antagonist/alien/borer.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/objects/items/robot/robot_parts.dm
	code/setup.dm
 2015-09-05 09:24:30 +02:00
Chinsky
34662a83b5 Merge pull request #10998 from Zuhayr/antagsystem 
Antag system fixes.
 2015-09-05 07:56:42 +03:00
Zuhayr
f74182680c Fixes autotraitor. 2015-09-05 13:15:30 +09:30
Zuhayr
7af1f27b28 More debug feedback. 2015-09-05 12:57:20 +09:30
Zuhayr
58cd8c3e03 Added debug verbs/feedback. 2015-09-05 12:05:32 +09:30
Zuhayr
8c743329df Merge pull request #10955 from SkyMarshal/multi-z 
Overhauls Multi-Z
 2015-09-05 11:36:59 +09:30
Zuhayr
12a5c47413 Added a proper cooldown on latespawn, added loyalist role to char setup. 2015-09-05 10:46:23 +09:30
Daranz
ddeec9c89a Fix effects for clonexadone 2015-09-04 16:06:03 +02:00
Zuhayr
553ac01552 Autotraitor cleanup. 2015-09-04 20:17:47 +09:30
Zuhayr
23fb8d8b99 Antag system cleanup/fixes. 2015-09-04 18:28:05 +09:30
PsiOmega
93a8a3a13f Observers can now view radio settings, admins can alter them. 2015-09-04 10:07:41 +02:00
Chinsky
94f7538d01 Merge pull request #10934 from PsiOmegaDelta/150822-Intercoms 
Removes radio free range option, adds out-of range options
 2015-09-03 20:47:39 +03:00
PsiOmegaDelta
7bcf9aaea9 Merge pull request #10340 from comma/russian_roulette 
Russian roulette and russian roulette accessories
 2015-09-03 19:40:01 +02:00
Chinsky
72d768808a Merge pull request #10110 from mwerezak/shields 
Better shield handling
 2015-09-03 20:38:48 +03:00
Chinsky
9728f28880 Merge pull request #10843 from PsiOmegaDelta/150924-CultSpeech 
Relocates Cult/Occult languages to unused keys.
 2015-09-03 20:37:16 +03:00
Chinsky
431db2bdbb Merge pull request #10970 from Zuhayr/complexholder 
Added a complex holder for human mobs + example icons
 2015-09-03 20:36:17 +03:00
PsiOmegaDelta
ad2e922776 Merge pull request #10971 from Zuhayr/sight 
Added short-sightedness and sight flags proc.
 2015-09-03 17:21:05 +02:00
PsiOmega
e5aa095f09 Non-headset/borg radios now all allow access to department channels. Headset and borg radios still rely on their encryption keys. 2015-09-03 09:38:15 +02:00
PsiOmega
593922929b Changelog entry. 2015-09-02 16:54:54 +02:00
PsiOmega
a7c527f491 Compilation fixes. 2015-09-02 15:14:24 +02:00
PsiOmega
affff253bc Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	.travis.yml
	code/modules/mob/living/living.dm
	code/modules/mob/mob_grab.dm
 2015-09-02 14:58:13 +02:00
PsiOmega
d78db0231b Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-09-02 14:42:27 +02:00
PsiOmega
13780eba09 Rotates and otherwise cleans up map intercom usage. 2015-09-02 14:26:59 +02:00
PsiOmega
1b23f794c5 Merge remote-tracking branch 'upstream/dev' into 150822-Intercoms 2015-09-02 10:54:04 +02:00
Zuhayr
2a02f4890c Merge pull request #10336 from atlantiscze/phoronwindowsv2 
Borosilicate windows
 2015-09-02 16:11:39 +09:30
Chinsky
0f76c59944 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into technoir 
Conflicts:
	icons/mob/head.dmi
 2015-09-02 04:50:00 +03:00
Chinsky
a3b3e52959 Merge branch 'dev' of https://github.com/comma/Baystation12 into technoir 2015-09-02 04:38:26 +03:00
PsiOmega
6e2514d728 Beepsky should no longer attempt to arrest himself. 
Adds additional threat check.
 2015-09-01 18:25:51 +02:00
Chinsky
03f5254850 Restores suit rolling verb. 2015-09-01 13:50:38 +03:00
Chinsky
667debfb3c Merge pull request #10745 from mwerezak/mob-grab 
Cleans up mob_grab.dm
 2015-09-01 12:58:50 +03:00
Chinsky
cf0a3f94d0 Merge pull request #10808 from Hubblenaut/dev 
Bar drinks
 2015-09-01 12:56:54 +03:00
Chinsky
28cf860332 Adds revolver spin sound. 2015-09-01 12:18:49 +03:00
Zuhayr
1362271e60 Added short-sightedness for species, added groundwork for variant species sight flags. 2015-09-01 11:42:33 +09:30
Zuhayr
bd76f977da Added a complex holder for human mobs + example icons (for an unadded species) 2015-09-01 11:39:22 +09:30
Zuhayr
3f6f34c16f Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/carbon/human/species/station/station.dm
	icons/mob/head.dmi
 2015-09-01 11:22:10 +09:30
Zuhayr
7581717246 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	maps/exodus-1.dmm
 2015-09-01 10:55:19 +09:30
Atlantis
e0a70d24ba Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2 2015-09-01 03:22:08 +02:00
GinjaNinja32
2d4c56a41e Merge pull request #10940 from Zuhayr/dev 
Limbs now copy hair data from their owner and may have optional body hair icons blended into them.
 2015-08-31 20:57:40 +01:00
Raptor1628
a7ff1a09ee Adds Supply Fax 
Quartermaster now has fax access and a fax machine. Fax machines have a
third admin channel, "Supply" for special requests like three thousand
mankinis or a Phazon, up to the admins to accept or deny requests, and
deduct cargo points if they'd like to.
 2015-08-31 15:32:35 -04:00
Zuhayr
7f97527471 Merge pull request #10581 from Kelenius/ofMechfabAndPanic 
Updates mechfab
 2015-08-31 17:39:04 +09:30
Kelenius
57ab846273 Merge branch 'dev' into ofMechfabAndPanic 
Conflicts:
	maps/exodus-1.dmm
 2015-08-31 10:57:04 +03:00
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