Commit Graph

14247 Commits

Author SHA1 Message Date
Zuhayr 8602f07d31 Allowed grenades to be stuffed into mouths and primed. 2015-12-24 21:55:05 +10:30
Zuhayr f93ea6a78f Tweaks to previous commits.
More tweaks to IPC fixes.
Merge resolution/compile fixes.

Further work on properly integrating, updating and fixing prosthetic options.

Repathed internal organs to organ/internal.

More work on full synthetics, changelings, overheating.

Working on getting organs to qdel properly and spawn properly when robotized.

Finalized some overheating values, added remaining prosthetic icons.

Finalizing the testing version of the full prosthetic bodies branch.

Added suit cyclers to the autolathe and map.

Fixing runtime errors.

Fixing errors.

Changelog.

Replacing limb and organ strings with constants.

Prevented brainless species from becoming full cyborgs.

Fixed issues with brain/MMIs renaming themselves inappropriately.

Various fixes and oversights.
2015-12-24 21:13:40 +10:30
Zuhayr d71573e749 Further work on properly integrating, updating and fixing prosthetic options.
WIP
Allowed heads/bodies to be prosthetic. Removed IPC. Refactored some flags.
2015-12-24 21:10:33 +10:30
Zuhayr 53b2c6be80 Merge pull request #11737 from PsiOmegaDelta/151223-Paralysis
Adds a paralyze button for easier administration
2015-12-23 23:28:37 +10:30
PsiOmegaDelta 70b84d87a6 Tweaks permission rights. 2015-12-23 13:01:03 +01:00
Datraen 65f68602e7 Adds a longer timer to paralyze, allows for other mobs to fall under this proc.
Conflicts:
	code/modules/admin/admin.dm
2015-12-23 12:57:43 +01:00
Datraen c5912b988c Adds a paralyze button for easy administration.
Conflicts:
	code/modules/admin/admin.dm
2015-12-23 12:56:48 +01:00
PsiOmegaDelta f54dd94a66 Merge pull request #11735 from Baystation12/master
Dev-freeze
2015-12-23 11:33:35 +01:00
Neerti 650396af6f Merge pull request #648 from Datraen/Respawn-Time-Change
Respawn time change
2015-12-23 02:59:59 -05:00
woodratt 30acc6de7e 1.3.7. Fixes and Adjustments
- Rough fix in place for the holodeck thunder dome.
- Jukebox added to the coffee shop and bar.
- Latex gloves added to Xenoflora.
- Insulated gloves added to Engineering Outpost.
- Connected the main airlocks on the mining and research outposts to the distro.
- Changes 'Vir Regional Spaceport' to ' Vir Interstellar Spaceport'
- Fixed another name issue in reference to crew transfer shuttle.
2015-12-22 22:51:36 -08:00
Atlantis 9fa1513647 Fixes AI's Examine()
- Message about AI's backup power now only show when the AI still lacks external power.
2015-12-23 00:57:54 +01:00
Datraen 0b4ed44ce4 Fixes admin verb, also adds changelog. 2015-12-22 15:09:28 -05:00
Datraen e443ffd06a Changes time to respawn down to 15 minutes. 2015-12-22 15:04:23 -05:00
Neerti 51552a8bdd Clarification on mercenary shuttle approaching message, and fixes typo on text when the drone event ends. 2015-12-22 05:03:57 -05:00
Neerti f053e91534 Merge pull request #641 from Mark9013100/12/21/2015blackscrubhat
Adds the black scrub cap
2015-12-22 05:00:16 -05:00
PsiOmegaDelta 3cf0a0e182 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
2015-12-22 10:46:55 +01:00
Zuhayr 407ec5645d Merge pull request #563 from Sabess/master
Adds Brass Knuckles
2015-12-22 14:15:22 +10:30
GinjaNinja32 9c267539a3 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-22 02:55:31 +00:00
Neerti 96b2d6faf2 Merge pull request #524 from Zuhayr/jobages
Job age refactor.
2015-12-21 21:02:29 -05:00
ccomp5950 5873a92df8 Fixes the icon for numbness.
Resolves #11435
2015-12-21 15:30:26 -05:00
Mark9013100 cbbafa5170 Adds the black scrub cap 2015-12-21 12:25:43 -05:00
Neerti 45f74c4c47 Text macro added on request of PsiOmegaDelta. 2015-12-21 04:25:59 -05:00
Neerti 6fed0d4132 I'm an idiot. 2015-12-21 04:05:43 -05:00
Neerti 451c477e4c Tweaks event text to fit with the lore better.
Adds more informative text for vending machines.
Removes RNG viruses.
2015-12-21 04:01:05 -05:00
Neerti 0483cc3126 Merge pull request #637 from zekesulastin/flame-dress
Adds black-with-blue-flame dress to custom loadout
2015-12-21 00:09:18 -05:00
ZekeSulastin a29dce6070 Adds black-with-blue-flame dress to custom loadout 2015-12-21 00:05:03 -05:00
Neerti c25b36e542 Merge pull request #635 from Zuhayr/resomiremoval
Removes Resomi.
2015-12-20 21:18:01 -05:00
EmperorJon 0928e88e02 Merge pull request #636 from EmperorJon/21_Dec._Fix_general_flavour_text
Fixes the general flavour text field.
2015-12-21 00:31:47 +00:00
Jon 330c7c1cc8 Fixes the general flavour text field.
The field was blanking each time it was opened to edit.
2015-12-21 00:19:08 +00:00
Zuhayr c9f579e00a Removes Resomi. 2015-12-21 09:56:11 +10:30
Neerti df2f02c5af Merge pull request #632 from Mark9013100/12/20/2015secpistol
Replaces the standard .45 pistol with the Detective's.
2015-12-20 16:02:42 -05:00
Datraen 0122262140 Asteroid now processes air properly. 2015-12-20 15:51:34 -05:00
Mark9013100 a4b891f5ef Replaces the standard .45 pistol with the Detective's. 2015-12-20 15:36:26 -05:00
Neerti 6b2bbf3d63 Merge pull request #630 from Datraen/ParalyzeVerb
Adds a paralyze button for easy administration.
2015-12-20 14:43:51 -05:00
Datraen f9c6c0549e Adds a longer timer to paralyze, allows for other mobs to fall under this proc. 2015-12-20 14:38:10 -05:00
Datraen d2eba4610f Adds a paralyze button for easy administration. 2015-12-20 14:20:09 -05:00
Zuhayr 6faeea5462 Fixes for the asteroid turf post-changes. 2015-12-21 04:59:32 +10:30
PsiOmegaDelta 5d3d0c5dc3 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/material/kitchen.dm
2015-12-20 11:22:08 +01:00
woodratt 8cd20b03f3 1.3.6 - Bug Fixes and Spurs
- Replaced 971 left facing windows with ones without super health.
- Adjusted lights in both the medical and engineering rest rooms.
- Adjusted several intercoms across the station, including the AI core ones.
- Centcomm beach area sounds removed.
- Adjusted maintenance between bridge and kitchen.
- Keycard Identification thing added to HoP office.
- Plastic flaps added to cargo deliveries office.
- Fixed Emitter in Engineering outpost.
- Fixed voided tile on t-comms, fixed the dark tiles.
- Added a mighty fine cowboy hat.
2015-12-19 21:41:35 -08:00
ccomp5950 ce3587d867 Hallucinations no longer burn on the SuperMatter 2015-12-19 21:33:02 -05:00
PsiOmegaDelta 378f62b81e AI qdel() improvements.
AI destruction now cleans up more of its held objects and variables.
Fixes some issues with the AI powersupply qdel().
Fixes #11710.
2015-12-19 11:45:24 +01:00
SinTwo e63e9b0b2a The great childrening. 2015-12-19 00:54:29 -05:00
SinTwo b03a4d68be Sin's Sprite Attack 2015-12-18 23:35:29 -05:00
SinTwo c43289b7fc Adds more clothes. (againagainagainagain) 2015-12-18 18:19:17 -05:00
sabess a9a0573237 Removed brass knuckles from steel sheets, added to hacked autolathe. 2015-12-18 13:16:09 +11:00
Zuhayr 4de9479b47 Fixes colour issues. 2015-12-18 10:52:56 +10:30
EmperorJon 94eb6c4e30 Merge pull request #597 from Hubblenaut/blob
Prevents blob from growing over asteroid walls
2015-12-18 00:09:07 +00:00
Hubblenaut 56d8975a19 Tweaks Filtering and Toxic Gases 2015-12-17 17:50:30 +01:00
SinTwo 14cc3c9574 Merge pull request #607 from PolarisSS13/12/16/15_Sin2_Clothes_Update
Jackets
2015-12-16 17:54:27 -05:00
SinTwo 41dcee7d0e Jackets 2015-12-16 17:36:48 -05:00