cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-01-04 06:22:38 +00:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 2 Branches 1 Tag
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

5290 Commits

Author SHA1 Message Date
mwerezak
6ceffaacb5 Refactors item_attack.dm 
Refactors and cleans up item_attack.dm and related mob attack code
 2015-09-08 23:23:31 -04:00
PsiOmegaDelta
6a956d0d0a Uplink fixes. 
Adds a default welcome message. Was lost in a game mode cleanup.
Traitors should now have telecrystals again. Also lost in the game mode cleanup.
Uplinks without correctly defined owners are now also printed in the round end summary.
 2015-09-08 08:43:40 +02:00
PsiOmegaDelta
23a3433e67 Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums. 2015-09-08 08:32:09 +02:00
PsiOmegaDelta
94b4c483ba Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-08 08:22:37 +02:00
PsiOmegaDelta
ec7e2491be Updates "on merge" entries. Relocates code. 2015-09-08 08:03:14 +02:00
PsiOmegaDelta
2f183e1cee Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
	code/modules/nano/modules/human_appearance.dm
 2015-09-08 07:58:25 +02:00
PsiOmega
0e2f44e3ac Admin logs bought uplink items. 2015-09-07 20:02:43 +02:00
Zuhayr
88b95e1207 Fixes #7951 2015-09-07 14:40:23 +09:30
Zuhayr
e27eda4c86 Merge pull request #10672 from mwerezak/frag-grenade 
Adds fragmentation grenades
 2015-09-07 14:12:27 +09:30
Zuhayr
0c56bdd448 Merge pull request #10266 from PsiOmegaDelta/150722-TagPairs 
Makes it possible to define multiple tag pairs for the Travis check.
 2015-09-07 13:57:09 +09:30
Zuhayr
fca95039bf Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/traitor/traitor.dm
	code/global.dm
	code/modules/mob/inventory.dm
	code/modules/mob/living/living.dm
	html/changelogs/.all_changelog.yml
 2015-09-07 11:31:19 +09:30
Zuhayr
b9c01bf2f2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze 
Conflicts:
	code/game/objects/items/devices/uplink.dm
 2015-09-07 11:17:06 +09:30
Neerti
bedeb1fdff Hopefully fixes some bugs that came out of that merge. 2015-09-06 20:00:01 -04:00
Neerti
a9dda6cf3f Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 9/6/2015_baymerge 
Conflicts:
	.travis.yml
	code/game/gamemodes/cult/cult.dm
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/ninja/ninja.dm
	code/game/gamemodes/nuclear/nuclear.dm
	code/game/gamemodes/traitor/traitor.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/security.dm
	code/game/objects/structures/lattice.dm
	code/global.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/reagents/Chemistry-Recipes.dm
	config/example/config.txt
	polaris.dme
 2015-09-06 18:26:06 -04:00
Chinsky
2563821832 Merge pull request #10972 from Zuhayr/resomi 
Adds the Resomi.
 2015-09-06 13:09:34 +03:00
PsiOmega
cc960624b9 Fixes mercenary mode not listing bought items. 
The mercenary leader now spawns with the uplink, as is set as its owner.
 2015-09-06 10:43:09 +02:00
Chinsky
71d1853ede Merge pull request #10993 from Zuhayr/species 
Human subspecies.
 2015-09-06 04:25:21 +03:00
Zuhayr
2b2e27d380 Species flash cleanup. 2015-09-06 10:09:03 +09:30
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
6dc3b22432 Death to flashrev (compile fix) 2015-09-06 00:45:13 +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
Zuhayr
8c743329df Merge pull request #10955 from SkyMarshal/multi-z 
Overhauls Multi-Z
 2015-09-05 11:36:59 +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
Zuhayr
a41ce0bd93 Added the Resomi. 2015-09-04 08:57:03 +09:30
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
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
52eae80d74 Makes the cyborg radio menu more consistent. 2015-09-03 08:41:02 +02:00
PsiOmega
593922929b Changelog entry. 2015-09-02 16:54:54 +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
PsiOmega
c730a67d79 Makes it possible to select department channels on intercoms. 2015-09-02 10:38:16 +02:00
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
Atlantis
e0a70d24ba Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into phoronwindowsv2 2015-09-01 03:22:08 +02: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
SkyMarshal
772c320303 Multi-Z. 2015-08-30 14:15:20 -07:00
PsiOmega
0bd41e604b Merge remote-tracking branch 'upstream/dev' into Backup 2015-08-30 15:55:10 +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
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
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
mwerezak
db8aefb121 Refactors duplicate parry code 2015-08-28 14:39:28 -04:00