Ben Reeve
6185bbd212
Unified radiation system
2017-05-22 16:24:34 +01:00
Yoshax
12a269b503
Adds craftable autoinjector to the autolathe
2017-05-22 02:14:01 +01:00
MagmaRam
2a42f9ef55
Merge pull request #3405 from Anewbe/bullet_swap
...
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-21 13:17:58 -05:00
Leshana
0f593fe087
Updated crew monitor computer to support multi-z output and nanomaps.
2017-05-17 00:59:10 -04:00
Leshana
5ae26332fa
Merge branch 'master' into aro-tether-wip
...
# Conflicts:
# code/ZAS/_docs.dm
# code/game/area/areas.dm
# code/game/objects/explosion.dm
# code/modules/holodeck/HolodeckControl.dm
# code/modules/mob/living/say.dm
2017-05-16 00:26:32 -04:00
Anewbe
903a2a2e5f
Fixes a few things, adds 556 clips
2017-05-12 18:03:49 -05:00
Arokha Sieyes
0a33bd5234
More tweaks to new head guns
2017-05-09 11:08:48 -04:00
Leshana
4fbfa7ee37
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2017-05-08
...
# Conflicts:
# code/modules/mob/dead/observer/observer.dm
# code/modules/mob/living/carbon/human/life.dm
# code/modules/mob/mob_defines.dm
# html/changelogs/.all_changelog.yml
# vorestation.dme
2017-05-08 21:07:45 -04:00
Anewbe
3b82b75f83
Merge pull request #3396 from Cerebulon/skirtsuits
...
Adds 24 new skirt versions of suit sprites.
2017-05-05 21:55:14 -05:00
Anewbe
2c42583d1b
Merge pull request #3416 from Bromuzl/Undershirt-corrections
...
Undershirt corrections
2017-05-05 20:15:42 -05:00
Bromuzl
ef678994f7
Adding missing shirts to Undershirt, minor cleanup
...
Two of the button-down shirts were not referenced in the undershirt datum, removed one previously accidentally added twice.
2017-05-05 05:05:56 -05:00
Anewbe
393dec4e2b
Merge pull request #3408 from Yoshax/floralsomatoray
...
Adds Gene Targetting mode to Floral Somatoray
2017-05-03 14:50:18 -05:00
Datraen
3d442044d1
Adds Gene Targetting mode to Floral Somatoray
...
While I was rooting around in hydroponics code, I saw that a list was being regenerated with UI interaction, so I threw the list into the plant controller.
No proper sprites for the Floral Somatoray's new mode yet, but it uses the gun sprite from mutate mode, and the projectile sprite from yield mode.
2017-05-03 13:33:58 +01:00
Anewbe
58b9c63ec2
Makes the 556 and 762 calibers more appropriate to their naming
2017-05-01 20:25:43 -05:00
Yoshax
03ff489f7a
Kinda reworks Hyposprays/Autoinjectors
2017-04-30 17:13:00 +01:00
Anewbe
896de44e43
Can now get the unathi liquour as a contraband crate
2017-04-29 14:46:46 -05:00
Cerebulon
339b269393
Adds 23 new skirt versions of existing suit sprites.
...
Adds them to loadout options and departmental uniform lockers as appropriate.
One new (Old Woman Attire) as equivalent to old man suit.
Some are unused, but now skirt sprites exist.
2017-04-29 12:01:40 +01:00
Arokha Sieyes
055c998f82
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/integrated_electronics/subtypes/reagents.dm
# code/modules/mob/living/carbon/human/species/station/station.dm
# code/modules/organs/organ_external.dm
# code/modules/ventcrawl/ventcrawl.dm
# html/changelogs/.all_changelog.yml
2017-04-25 15:04:54 -04:00
Atermonera
3f1194696a
Brain type is shown on all records
2017-04-22 18:18:31 -07:00
OrbisAnima
cbf945d02f
Cargo love: Reviews Corrections
2017-04-21 11:55:27 -03:00
Anewbe
e17eccae93
Adds ion pistol to uplink, allows holstering
2017-04-20 20:04:21 -05:00
OrbisAnima
3efabaf2ab
Added 3 new crates to cargo:
...
Recreation: - Recreational Restraints, all the kind of stuff you might need to restrain someone but still showing you care, whip included.
Science: - Dangerous Predator Crate, contains a random common predator for science analisys, a system that might come in the future!
(Contraband) Extremely Dangerous Predator Crate, Contains a random yet quite mortal predator, for analiisys only by the bravest or fooliest people in the crew.
2017-04-20 20:48:27 -03:00
Arokha Sieyes
e7d8af7ae7
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
...
# Conflicts:
# code/modules/client/preference_setup/loadout/loadout_xeno.dm
# code/modules/mob/mob.dm
# html/changelogs/.all_changelog.yml
2017-04-10 20:41:18 -04:00
Arokha Sieyes
6d74e20e2a
Fix up a few more things with synth printing
...
Species now 'suggested' by robolimb manufacturer, helps with getting the correct hairstyle choices for each synth, so Taj have access to Taj hair styles and whatnot in mirrors if they are using a Taj-based synth. Also adds a DSI Akula variant that Zalvine should touch up later hopefully.
2017-04-09 23:56:13 -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
Arokha Sieyes
87b3376c37
Merge pull request #1359 from Yoshax/disks
...
Adds DSI Synth disks to advanced robolimbs cargo crate
2017-04-07 13:20:59 -04:00
Yoshax
5f049fda55
Adds DSI Synth disks to advanced robolimbs cargo crate
2017-04-07 16:50:26 +01:00
Arokha Sieyes
2ed665cbd0
Autolathe card creation
2017-04-06 18:00:18 -04:00
Neerti
79a932e559
Merge pull request #3228 from Anewbe/package_bombs
...
Package bomb changes
2017-04-05 22:36:37 -04:00
Anewbe
40617b7695
Package bomb changes
2017-04-04 22:36:08 -05:00
Arokha Sieyes
85a489b9b6
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync
2017-04-04 20:25:00 -04:00
Anewbe
8e9db2b7d4
Aprons now have pockets
2017-04-02 00:28:20 -05:00
Leshana
6eee55c983
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync
...
# Conflicts:
# code/modules/client/preference_setup/general/03_body.dm
# code/modules/mob/new_player/sprite_accessories.dm
# html/changelogs/.all_changelog.yml
# icons/mob/human_races/markings.dmi
# vorestation.dme
2017-04-01 19:19:42 -04:00
Anewbe
1ea5252f5d
Merge pull request #3181 from VOREStation/vplk-pipelayer
...
Modernize the automatic pipe layer
2017-04-01 15:59:05 -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
Anewbe
72adee8fb8
Adds a bunch of things to cargo
2017-03-31 00:23:27 -05:00
Leshana
ab4c63791a
Modernize the automatic pipe layer
...
* Upgrades the automatic pipe layer to modernize its code a bit towards latest standards and fixing various bugs.
* Make it constructable so it can acutally be used by someone!
2017-03-30 18:13:37 -04:00
MagmaRam
33dffeb0b8
Merge pull request #2955 from Anewbe/heart_damage
...
Big Ol' Medical Tweaks
2017-03-28 20:02:24 -05:00
JoanRisu
bd9d9c5078
Fixes typo for dune buggy in code and adds fluff boxes to the quick create menu.
2017-03-27 01:58:49 -07:00
JoanRisu
729168790a
Merge branch 'master' of https://github.com/VOREStation/VOREStation into Fluff_Items_worshop
2017-03-26 22:43:18 -07:00
JoanRisu
8d6377f4b4
adds vehicles to the cargo lists and makes changes to a few things.
2017-03-26 22:39:54 -07:00
Yoshax
ba7cad162d
Revert "Makes space in the uniforms.dmi file"
...
This reverts commit 6b0500dd27
2017-03-27 03:34:12 +01:00
Arokha Sieyes
9edf3a6629
Polaris Merge Sync
2017-03-26 20:12:34 -04:00
Anewbe
6b0500dd27
Makes space in the uniforms.dmi file
2017-03-26 00:59:14 -05:00
Anewbe
3ba498fc47
Fixes the fake command report
2017-03-24 22:57:09 -05:00
Anewbe
3c1d897fc4
Actually gets the HI name right
2017-03-24 15:27:55 -05:00
Anewbe
5c51fcfa60
Fixes HI cost
2017-03-23 15:32:05 -05:00
Leshana
f93141d7d3
Merge remote-tracking branch 'polaris/master'
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station/prometheans.dm
# code/modules/mob/living/simple_animal/animals/cat.dm
# code/modules/mob/living/simple_animal/simple_animal.dm
# vorestation.dme
2017-03-22 20:08:29 -04:00
Anewbe
2c9c3e208e
Merge branch 'master' of https://github.com/PolarisSS13/Polaris into heart_damage_2
...
# Conflicts:
# code/modules/mob/living/simple_animal/hostile/giant_spider.dm
# code/modules/organs/blood.dm
# code/modules/organs/internal/lungs.dm
# code/modules/organs/organ.dm
# code/modules/organs/organ_external.dm
2017-03-22 17:29:01 -05:00
nachomeep
e1554f323b
Adds engineering + science crates ( #3072 )
...
* Adds engineering + scicrates.
* Enables the science crate
* Updates engineering crate icons.
* Inflatables don't need security.
* fixes RCD crates
2017-03-21 18:38:47 -05:00
