cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2025-12-25 09:31:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,726 Commits 2 Branches 1 Tag
b1c636b3f604d3a3456e4efb978b51a1afcd68ca
Commit Graph

709 Commits

Author SHA1 Message Date
Anewbe
5c0a4215a2 Moves all slowdown for Hardsuits to the backpack 2016-05-21 21:43:40 -05:00
Arokha Sieyes
8e90199052 Generic Station & System Name 
Makes the name of the starsystem and station generic such that it can be modified in global.dm and replace the strings where it is used. This won't have an effect on Polaris itself, but makes changing the name much more simple for forks. Using string concat constants on the advice of Psi.
 2016-05-16 15:34:03 -04:00
Zuhayr
6edb8b31f3 Made slimes more interesting. 2016-05-06 04:07:52 +09:30
Hubblenaut
9338f770f8 Ninja fixes and changes (#1547) 2016-05-04 13:45:25 -04:00
Datraen
beda3185eb Reverts the second mob clean up because of incomplete implementation. 
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
 2016-05-04 00:24:55 -04:00
Hubblenaut
4e072f8b9e Adds object sprites for teshari voidsuits 2016-04-28 16:01:42 +02:00
Datraen
13db5ee7f7 Resolves a missing implementation of the new item removal proc. 2016-04-25 21:43:12 -04:00
Yoshax
ad89dff60b Hardsuits are now only checked for access when not sealed 2016-04-22 22:06:23 +01:00
Neerti
2a946fc23d Merge pull request #1243 from Kelenius/cleanupTwo 
Mob inventory cleanup, part 2
 2016-04-21 21:07:22 -04:00
Kelenius
98badae45f Merge branch 'master' into cleanupTwo 2016-04-21 11:41:32 +03:00
Anewbe
40ce9dc904 Gives Breacher helmets force 5, makes their headbutts more dangerous 2016-04-20 22:10:44 -05:00
Neerti
25c04df5bd Polaris tweaks. 
Fixes mistake involving belts.
Fixes mistake involving bags allowing w_class 5 items, which was from the manual merge.
Polaris tweaks

Makes inflatables w_class 3.
Spacesuits and RIGs are now w_class 5.
Both sniper weapons are now w_class 5.
Makes more inventories able to use the volume based system.
Cleans up the cig part of the port a bit.
 2016-04-06 07:48:09 -04:00
Kelenius
df5a0d7941 Mob inventory cleanup 
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
 2016-03-24 01:23:08 +03:00
Neerti
a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup 
Mob inventory cleanup
 2016-03-22 21:42:27 -04:00
Kelenius
1683761d6a Fixes #1171 2016-03-21 14:22:44 +03:00
Kelenius
afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +03:00
Neerti
b4b8d94723 Merge pull request #1015 from Zuhayr/xenosremove 
Removes xenormorphs.
 2016-03-04 12:34:13 -05:00
Neerti
6224e978a9 Merge pull request #1014 from Zuhayr/voxremove 
Removed the Vox Pox.
 2016-03-04 12:32:23 -05:00
Datraen
793045b053 Returning 1 causes module switching to run twice. 2016-02-23 17:21:25 -05:00
Mark9013100
1928b102e9 Fixes the RIG grenade launcher icon 2016-02-23 09:37:57 -05:00
Zuhayr
cbc506fd51 Removed xenomorphs. 2016-02-20 11:50:18 +10:30
Zuhayr
a628ae2a56 Removed the Vox Pox. 2016-02-20 11:24:19 +10:30
Zuhayr
7c3993b68b Revert "Revert "Bay update."" 2016-02-07 16:33:30 +10:30
Zuhayr
98d983577c Revert "Bay update." 2016-02-07 16:07:05 +10:30
Zuhayr
115eb19d33 Merge branch 'bayupdate' of https://github.com/Zuhayr/Polaris into bayupdate 2016-02-06 14:30:51 +10:30
Neerti
960a64e760 Allows suit cooling units to be attached to voidsuits. 2016-02-04 12:38:20 -05:00
Zuhayr
e557a71fdc Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 2016-01-20 08:01:14 +10:30
Zuhayr
0148e78eda Removed targeting. 2015-12-16 10:25:18 +10:30
ccomp5950
f0b6a933aa Ninjas teleporter: Checks Z levels and distance. 
Ninjas are able to use a camera console and teleport across the map.  This resolves that.
 2015-12-10 10:55:13 +00:00
PsiOmegaDelta
c4d6a76887 Merge pull request #11649 from Baystation12/master 
Dev-freeze
 2015-12-10 08:21:43 +01:00
ccomp5950
f6f6a4ef87 Ninjas teleporter: Checks Z levels and distance. 
Ninjas are able to use a camera console and teleport across the map.  This resolves that.
 2015-12-09 17:27:27 -05:00
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
SinTwo
897e6c8382 Fixes some clothes. 2015-12-07 22:49:32 -05:00
PsiOmegaDelta
da946eda99 Adds energy costs to some rig equipment. 
Plasma cutter - 5 units
Drill - 1 unit
 2015-12-06 13:30:28 +01:00
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
Neerti
2c81761494 Removes most references to NSS Exodus. 2015-12-03 13:47:37 -05:00
SinTwo
c9db7fdab1 Fixes Voidsuit Helmets 2015-12-03 12:48:53 -05:00
Zuhayr
7801c2dc3b Minor runtime fixes. 2015-12-02 20:11:31 +10:30
Zuhayr
2f344ed111 Adds a confirmation to user-activated ninja self destruct. 2015-12-02 19:55:54 +10:30
Zuhayr
6623c1650f Rig unEquip() amendments. 2015-12-02 19:55:43 +10:30
Zuhayr
1b6282b43f Fix for a merge error resulting in very wonky hardsuit behavior. 2015-12-02 19:55:32 +10:30
PsiOmegaDelta
1a293e2d96 Renames the rig mounted taser. 
Was previously called an energy gun, which could be mildly confusing.
Port of https://github.com/PolarisSS13/Polaris/pull/127.
 2015-12-01 08:48:47 +01:00
Mark9013100
880ba681e6 Combination of my previous PRs, mostly fixes 2015-11-29 11:13:17 -05:00
PsiOmegaDelta
ee13279003 Merge pull request #11453 from Baystation12/master 
Dev-freeze
 2015-11-16 18:13:18 +01:00
PsiOmegaDelta
8584513652 Fixes the mining rig camera not properly showing up on the station camera list. 
Was using "Mine" instead of "MINE. Corrected by replacing all networks with the defined presets.
 2015-11-14 00:43:11 +01:00
SinTwo
c88689662c Merge pull request #1 from PolarisSS13/master 
Update
 2015-11-08 18:51:43 -05:00
SinTwo
8c816a9f28 Helmets 2015-11-08 18:10:34 -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
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
 2015-10-10 23:17:26 -04:00