Commit Graph

21560 Commits

Author SHA1 Message Date
Yoshax
e2388e06d9 Updates terminology 2015-12-31 01:00:05 +00:00
Yoshax
9da04751ef Removes actually seen mentions of the word retard 2015-12-30 19:52:57 +00:00
PsiOmegaDelta
059d9cd131 Re-fixes skin tone not displaying the proper value when being edited in the character setup. 2015-12-30 16:29:41 +01:00
PsiOmegaDelta
cacdb48863 Can now load/save/reload while readied.
The load window also no longer pops under the character setup screen.
Just some small character preference QoL changes.
2015-12-30 16:29:35 +01:00
Zuhayr
4456a8c424 Added gear harnesses to the loadout. 2015-12-29 21:26:06 +10:30
GinjaNinja32
d3d9a79cd0 fix logging, fix commented-out code and explain comment 2015-12-29 06:49:18 +00:00
Neerti
59c1773286 Merge pull request #687 from Datraen/EAL-Speaker-Tweak
EAL given to Cyborgs, AI and pAI.
2015-12-28 23:47:41 -05:00
Datraen
48d0d6bb39 EAL given to Cyborgs, AI and pAI. 2015-12-28 20:32:41 -05:00
Zuhayr
1617a43685 Applying Harpy's prosthetic limb damage fix. 2015-12-27 17:27:19 +10:30
Neerti
39bb0acd42 Merge pull request #570 from GinjaNinja32/pl-chemistry
revert chemical dispenser revert
2015-12-26 19:47:25 -05:00
Zuhayr
77d386f199 Fix for brains ending up popping out of cryo consoles. 2015-12-26 17:06:53 +10:30
Zuhayr
9f729aad0c Fixed weapon use by borgs. 2015-12-25 09:33:07 +10:30
Zuhayr
9df402b0de Fixes issues with burn repair surgery for robolimbs. 2015-12-25 08:50:58 +10:30
GinjaNinja32
9dee0707e8 Merge remote-tracking branch 'polaris/master' into pl-chemistry 2015-12-24 15:06:16 +00:00
Neerti
084ba448fa Merge pull request #652 from Zuhayr/nerf
Added Nerf weapons to Cargo.
2015-12-24 06:47:48 -05:00
Zuhayr
e555c8432f Merge pull request #640 from Neerti/12/21/2015_event_tweaks
Random Event Tweaks
2015-12-24 22:11:19 +10:30
Zuhayr
5313c6b67b Added Nerf weapons to Cargo. Codersprites. 2015-12-24 22:05:10 +10:30
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
NullSnapshot
87afd2feb2 Fixes: #11351 #11357 #11359 #11361 2015-12-24 21:10:41 +10:30
NullSnapshot
4a92b5ee70 Fixes #11350 2015-12-24 21:10:41 +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
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
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
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
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
Datraen
64f60e39e5 Forces new uplink NanoUIs to start at category menu, avoids grayed out options. 2015-12-21 03:07:49 -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
Datraen
51bec27882 Merge pull request #628 from Datraen/SparksQdelFix
Stops sparks from trying to qdel twice.
2015-12-20 15:17:17 -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
c778ff59b2 Returns the deincrementation of spark count on the tile. Removal time is in line with the deincrementation time. 2015-12-20 14:41:55 -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