Leshana
28c193cbdb
Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04
...
# Conflicts:
# code/game/objects/items/devices/communicator/communicator.dm
# code/modules/client/preference_setup/occupation/occupation.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/mob_helpers.dm
# code/unit_tests/zas_tests.dm
# maps/southern_cross/southern_cross-1.dmm
# maps/southern_cross/southern_cross-3.dmm
# maps/southern_cross/southern_cross-6.dmm
# vorestation.dme
2018-01-04 22:44:04 -05:00
Leshana
a1734c97e9
Moved makepowernets() into SSmachines initialization proc.
2017-12-29 15:32:06 -05:00
Leshana
5ebcc92645
Port /tg garbage collection tweaks and statistics improvements
...
https://github.com/tgstation/tgstation/pull/30118 - Garbage collection tweaks and refactors.
https://github.com/tgstation/tgstation/pull/32022 - Find references fix.
2017-12-27 21:45:37 -05:00
killer653
3a2093ef40
Polaris sync
2017-12-21 04:01:07 -05:00
Neerti
2f7db506eb
Adds Variable Click Delay
...
Now certain weapons can strike faster or slower than usual. No weapons currently do this as this PR just lays the groundwork for that.
The click delay can also be modified with traits. The slime agility modifier makes attacks happen 25% sooner.
Adds debug test verb to display a weapon's DPS. It's really basic but should be sufficient for future force adjustments I might do in the future.
2017-11-28 16:11:56 -05:00
killer653
0c480ec15f
Polaris sync
2017-10-27 15:30:24 -04:00
Anewbe
3f2d996f7d
Improves Halloween costumes, tweaks the admin verb for equipping
2017-10-20 16:01:09 -05:00
killer653
1bb71ef429
Polaris Sync
2017-10-16 22:16:24 -04:00
Anewbe
0741b45570
Adds costumes, improves admin outfit verb
2017-10-14 02:19:13 -05:00
Anewbe
d0a22df9c3
Continues work on outfits
2017-10-01 20:50:30 -05:00
Anewbe
1b7ecf6789
Ports Bay's outfit system
2017-10-01 02:31:37 -05:00
Spades
07762f31e7
Some disorganizes changes by Aces
...
- UNSC is now USDF.
- .32 is now .380 instead.
- Added giskard to random gun spawns.
- Changed oliva to be a subtype of giskard.
- Rebalanced random gun spawner and added things.
- Detective no longer spawns with a pistol. It's in your locker instead.
- `SMG_sol` is now just `sol`.
- Fixed some ammo pathing to be consistent.
- Moves Asset Protection spawn point inside the big armory at CentCom.
- Adds a door in CentCom to let the ERT area actually be reached from
CentCom's bridge.
2017-09-21 03:22:20 -04:00
killer653
bddfa16f82
Polaris sync
2017-09-15 21:17:34 -04:00
Neerti
8f00965cc2
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 8/10/2017_make_xenobio_old_again
...
# Conflicts fixed:
# code/modules/admin/topic.dm
# code/modules/admin/verbs/debug.dm
# code/modules/admin/view_variables/helpers.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# code/modules/mob/transform_procs.dm
# maps/northern_star/polaris-1.dmm
# polaris.dme
2017-09-05 00:58:27 -04:00
Neerti
4bfcec55f2
work
2017-09-04 21:52:47 -04:00
Mechoid
7de08c2420
Fix them Travis errors.
2017-09-03 13:21:05 -07:00
Spades
2dd7519e1b
Loadouts
2017-09-03 14:33:13 -04:00
Mechoid
5d390ca67b
Brings back the aliens as they were when removed, minus huggers (until we can get a suitable replacement), for admins to use.
2017-09-03 01:46:08 -07:00
killer653
468e73c7f3
Polaris sync
2017-08-06 19:07:17 -04:00
Cameron653
e158fcd3cc
Macro Replacements. ( #3574 )
...
* A preface to my madness
Travis failed one of my PR's because I copied old code
that used /red /blue /green.
Because of this, I am going to find and replace every
instance of it that I find.
Also this is a test commit to make sure I'm comitting
to the correct branch.
* /blue /green /red replacements
Dear god.
A slow and painful death from acid is more fun than this.
I wouldn't wish this torture on my worst enemy.
And this is only the beginning
* Replace part 2.
Time to fix the human error.
* Fixes mismatches
* Sets macro count to 220
One above the current number of macros in the code.
* Fixes last of the mismatches.
* Removes spaces, replaces \black
Removes spaces
Replaces \black in a few areas where seen
Replaces \bold with <B> </B> where seen
* Updating macro count again
* More fixes!
* Issues fixed! For real this time!
I swear!
* Fixing all the merge conflict files.
2017-07-19 12:47:23 -05:00
Leshana
197a648795
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-06-01
...
# Conflicts:
# code/game/objects/structures/crates_lockers/closets/secure/security.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/ammunition/magazines.dm
2017-06-01 17:27:00 -04:00
Spades
8579adcc53
Naming convention of ammo is now consistent
...
s = Speedloaders. (Functionally the same as clips, but they're not
_really_ the same thing, just in case we change these later.)
c = Clips. (Can also be used to fill other magazines.)
m = Magazine. (Holds ammo rounds.)
a = Ammo. (Individual rounds of ammo.)
2017-05-26 19:32:23 -04:00
Leshana
5f5ea3ea3b
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26
...
# Conflicts:
# code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
# code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
# code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
# code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
# code/game/machinery/computer/Operating.dm
# code/game/machinery/computer/camera.dm
# code/game/machinery/computer/communications.dm
# code/game/machinery/computer/security.dm
# code/game/machinery/computer/skills.dm
# code/game/objects/items/devices/radio/jammer.dm
# html/changelogs/.all_changelog.yml
# maps/~map_system/maps.dm
# nano/images/nanomap_z1.png
# nano/images/nanomap_z5.png
2017-05-26 15:29:46 -04:00
Leshana
ecd19ee1af
Adds an admin verb to debug the current map datum.
...
Useful for making sure it loaded right.
2017-05-21 14:16:39 -04:00
Arokha Sieyes
4ae0352474
Fix debug verb for "Check Areas"
2017-04-24 14:26:05 -04:00
Arokha Sieyes
aaeae6695a
Make planets more generic
...
So that Sif doesn't have to be the only one!
2017-04-14 21:36:48 -04:00
Anewbe
e9c4b5a3eb
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# icons/mob/back.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
2017-04-07 16:11:50 -05:00
Anewbe
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
Anewbe
7bb3f5fbb7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into cosmetic_things
...
# Conflicts:
# code/datums/supplypacks/medical.dm
# code/game/objects/structures/crates_lockers/closets/wardrobe.dm
# code/modules/clothing/shoes/miscellaneous.dm
# code/modules/clothing/suits/labcoat.dm
# icons/mob/back.dmi
# icons/mob/feet.dmi
# icons/mob/human_face.dmi
# icons/mob/items/lefthand.dmi
# icons/mob/items/righthand.dmi
# icons/mob/suit.dmi
# icons/obj/clothing/shoes.dmi
# icons/obj/clothing/suits.dmi
# icons/obj/storage.dmi
# maps/northern_star/polaris-2.dmm
# maps/northern_star/polaris-5.dmm
2017-04-01 12:45:45 -05:00
Leshana
a5a805414b
Fixed paths references to obsolete path /obj/item/clothing/shoes/combat
...
* It was changed in most places to /obj/item/clothing/shoes/boots/combat but some were not. The changling subtype prevented any compile errors.
2017-03-06 21:58:39 -05:00
Anewbe
25b925f04c
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into boots
...
# Conflicts:
# maps/northern_star/polaris-1.dmm
# maps/northern_star/polaris-2.dmm
2017-03-02 16:53:29 -06:00
Anewbe
2de037fbbf
Ports a bunch of fluff stuff
2017-02-21 13:50:14 -06:00
Neerti
d398367e4c
Fixes a world << that crept in and apparently new lobby code.
2017-02-20 19:29:13 -05:00
Neerti
836d8dfa3f
More stuff, finalizes it I hope.
2017-02-20 18:28:31 -05:00
Anewbe
7417bef794
Boots are now a subtype of shoes
2017-02-05 16:17:41 -06:00
Anewbe
ac4b355f5e
Surgical tools will no longer cause damage on help intent
2017-01-21 18:34:05 -06:00
Anewbe
fda82d4b17
Hood tweaks
2017-01-18 17:02:01 -06:00
Anewbe
510cf17723
Waistcoats are accessories
2016-10-19 22:29:22 -05:00
Spades
2330968176
Replaces Station Administrator
2016-10-06 22:38:02 -04:00
SinTwo
a2a2f58e93
Fixes #2352
2016-08-27 13:44:32 -04:00
PsiOmegaDelta
c6105e01a0
Adds missing error handler that made it difficult to debug runtimes.
2016-08-25 18:21:55 +01:00
SinTwo
eabefc538a
Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"
...
This reverts commit 6bb5409349f6a83d5ee0
2016-08-15 12:58:00 -04:00
SinTwo
4fa126b7e7
a whole lot of nanoui upgrades
2016-06-24 00:43:16 -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
Kelenius
98badae45f
Merge branch 'master' into cleanupTwo
2016-04-21 11:41:32 +03:00
Datraen
e1c0256477
Brings the jumpsuits, pants, shorts, ponchos and hoodies under the path system.
2016-04-05 14:44:31 -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
Datraen
996ce92f7f
Merge pull request #1184 from Yoshax/510prep
...
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Datraen
fe9d3fd4c4
Merge pull request #1027 from Kelenius/mobCleanup
...
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Yoshax
8be10d96dd
Ports Byond 510 preperations from Bay
...
Updates comment
Updates supply file
2016-03-14 18:21:44 +00:00
