Commit Graph

26132 Commits

Author SHA1 Message Date
Anewbe
969aa45e9a Switches 2 for DEAD 2017-09-29 12:07:16 -05:00
Anewbe
7c5d7c4d75 Improves tracking implant code, adds a tracking implant variant to the loadout 2017-09-28 20:25:46 -05:00
Neerti
ea138e0cec Merge pull request #3968 from Anewbe/cham_gun
Tweaks the Chameleon Gun's tech levels
2017-09-28 16:25:02 -04:00
Neerti
d4dd908f94 Merge pull request #3962 from Anewbe/gravestone
Adds grave markers
2017-09-28 16:22:46 -04:00
Neerti
5cd490f7b2 Merge pull request #3940 from Anewbe/technomancer_armor
Improves the tesla and shield generator armors
2017-09-28 16:22:18 -04:00
Anewbe
6559299591 Merge pull request #3966 from elgeonmb/elgeonmb-brainlore
Drone circuit + posibrain lorechanges
2017-09-28 11:09:35 -05:00
Anewbe
1217c1d23c Merge pull request #3961 from MisterLayne/9/26/2017_CableSurgeryFix
Fixes cables on FBPs (and probably cyborgs)
2017-09-27 19:46:29 -05:00
Anewbe
7a13c8136f Finishing touches on gravemarkers 2017-09-27 18:59:26 -05:00
Neerti
853d8e80f1 Merge pull request #3914 from Anewbe/bone_fixer
Adds the bone clamp, and some alien surgery tools
2017-09-27 19:06:32 -04:00
Neerti
e0d450c5ea Merge pull request #3948 from Anewbe/flash_shield
The borg shield now protects them from flashes
2017-09-27 19:05:58 -04:00
Neerti
ab76e6d612 Merge pull request #3958 from Anewbe/legcuffs
Changes Legcuff sprites
2017-09-27 19:05:32 -04:00
Neerti
135c5b9219 Merge pull request #3950 from Anewbe/radiation_glows
Radiation-Mob Interaction tweaks
2017-09-27 19:05:09 -04:00
Anewbe
424ca30006 Merge pull request #3960 from MisterLayne/9/26/2017_Synthetic_Syring_Fix
Synth Syringe Fix
2017-09-27 17:42:43 -05:00
MisterLayne
c967d4cf6e Fixes cables on FBPs (and probably cyborgs) 2017-09-27 15:56:25 -04:00
Anewbe
eed312a8fb Merge branch 'master' of https://github.com/PolarisSS13/Polaris into gravestone
# Conflicts:
#	icons/obj/structures.dmi
2017-09-27 13:49:56 -05:00
elgeonmb
2df750f869 ur right prismatic 2017-09-27 11:23:30 -07:00
Anewbe
7aa1d4fcef Tweaks the Chameleon Gun's tech levels 2017-09-27 12:25:36 -05:00
elgeonmb
a17d83fb80 Drone circuit +posibrain lorechanges
Removes all that mumbo about "you live to serve" and replaces it with a reminder that you're designed to be friendly to human values. I don't really see the trouble with this-- if a new drone or posi wants to be a surly bastard, it can, it's just not getting sleeved in a shiny bipedal body.

Also adds a bunch of indulgent OS names for drone circuits.

(Realtalk this is mostly just me figuring out how PRs work so I can start being something closer to actually productive)
2017-09-27 02:09:06 -07:00
Anewbe
dcf4a6bfea Adds give-modifier to the debug verb list 2017-09-27 01:16:04 -05:00
Anewbe
280f3010f8 Adds grave markers 2017-09-26 21:03:34 -05:00
Anewbe
670ae66772 Merge pull request #3956 from Neerti/9/26/2017_old_farmer_harrison
Adds Farm PoI
2017-09-26 19:12:35 -05:00
Anewbe
215c080b1e Merge pull request #3438 from Neerti/5/9/2017_reopening_the_salt_mines
Adds Recently Cloned Modifier to Cloners
2017-09-26 19:09:12 -05:00
Anewbe
267f5299d9 Merge pull request #3932 from Cameron653/patch-4
Allows resting people to get off the ground w/ assistance.
2017-09-26 17:48:15 -05:00
MisterLayne
dde6d7d00a Merge branch 'master' of https://github.com/PolarisSS13/Polaris into 9/26/2017_Synthetic_Syring_Fix 2017-09-26 17:30:30 -04:00
MisterLayne
99d68540bc Fixes Glitched Synthetic Syring 2017-09-26 17:12:47 -04:00
Anewbe
c0205b1c78 Merge pull request #3953 from Woodratt/WR_09252017_SyndikatID
Syndicate ID changes
2017-09-26 16:03:16 -05:00
Anewbe
b6534b9008 Merge pull request #3949 from Atermonera/AI_langs
AI can speak station languages
2017-09-26 15:05:58 -05:00
Neerti
dcd2580dc2 Merge pull request #3918 from Anewbe/liver_alcohol
Adjusts liver damage from alcohol
2017-09-26 07:01:15 -04:00
Neerti
447ad5de70 Merge pull request #3927 from Anewbe/intercom
Adds more channels to intercom msg
2017-09-26 07:00:40 -04:00
Anewbe
a4dd5056b0 Changes Legcuff sprites 2017-09-26 05:48:59 -05:00
Neerti
1076b264aa Merge pull request #3942 from Anewbe/promethean_core
Moves the Promethean core to the chest. They no longer need heads.
2017-09-26 03:46:30 -04:00
Neerti
1b22c7e152 Merge pull request #3941 from Anewbe/lung_pressure
Different species can now have different minimum levels of air
2017-09-26 03:44:49 -04:00
Anewbe
6d0e6c4b0f Merge pull request #3757 from SpadesNeil/Ace-infuriates-Anewbe-with-another-vintage-weapon
Adds M1 Garand
2017-09-26 01:09:46 -05:00
Neerti
6d821a9cfd Adds compromise. 2017-09-26 01:50:02 -04:00
Neerti
aa454c0e1d Adds Farm PoI
Also fixes various bugs with surface tiles, hopefully.
Adds some documentation to the map file system.
Adds a new 'plane' map, ideal for testing PoIs by loading them manually.
Makes space heaters glow orange.
Adds a new grille type for fancy surface windows.
Adds self planting hydro trays/dirts if a seed is on top of them when the map is loaded.
2017-09-26 01:44:06 -04:00
Anewbe
7c9813e24a Fixes a runtime 2017-09-25 23:42:25 -05:00
Neerti
7c93f0089c Merge pull request #3944 from Anewbe/spiderbot_fix
Allows hatted slimes and spiderbots to ventcrawl properly.
2017-09-25 21:35:54 -04:00
Anewbe
caa4fecd8b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into bone_fixer
# Conflicts:
#	icons/obj/abductor.dmi
2017-09-25 20:35:19 -05:00
Neerti
c262cd91c2 Merge pull request #3933 from Anewbe/batteries
Battery tweaks, self recharge fix
2017-09-25 21:32:41 -04:00
Neerti
13685ec747 Merge pull request #3926 from Anewbe/to_chat_watercloset
Adds a few instances of to_chat()
2017-09-25 21:32:13 -04:00
Neerti
147ef64555 Merge pull request #3925 from Anewbe/fire_stack_control
Adds adjust_fire_stack to a few places
2017-09-25 21:31:44 -04:00
Neerti
1f9cf5b8f4 Merge pull request #3923 from Anewbe/catwalks_and_railings
Improves catwalks and railings
2017-09-25 21:31:28 -04:00
Neerti
6024698679 Merge pull request #3922 from Anewbe/organ_printer_fixes
Printed limbs now have species and skin color
2017-09-25 21:30:56 -04:00
Woodratt
9f806e2f67 Syndicate ID changes
- Added a Syndicate ID with all access (admin spawn only).
- Port of 'Syndicate id cards now listen for owner destruction' from Bay. Link https://github.com/Baystation12/Baystation12/pull/11563
2017-09-25 17:01:55 -07:00
Anewbe
f1c0b32688 Merge pull request #3946 from Neerti/9/25/2017_shields_and_spiders
More Simple Animal Tweaks
2017-09-25 18:12:10 -05:00
Anewbe
676f71994f Merge pull request #3943 from Neerti/9/24/2017_simple_mob_tweaks
Simple Animal Tweaks
2017-09-25 18:11:59 -05:00
Anewbe
d032051568 Merge pull request #3945 from Cyantime/pipexamine
Corrects pipe examine info.
2017-09-25 17:45:21 -05:00
Anewbe
5d0cc75a7f Radiation-Mob Interaction tweaks 2017-09-25 17:04:41 -05:00
Atermonera
650d2a7321 indents 2017-09-25 13:49:10 -07:00
Atermonera
a4fd97ca14 Rootlocal and -global can also be used by AI 2017-09-25 13:48:34 -07:00