Commit Graph

22389 Commits

Author SHA1 Message Date
Kelenius
aa3bcb6c26 Cultists no longer need to research words 2016-04-06 14:08:35 +03:00
EmperorJon
648a74a5c9 Merge pull request #1353 from Yoshax/progressbarfix
Adjusts reinforced wall construction
2016-04-04 19:41:51 +01:00
Yoshax
2f95f98ec1 Adjusts secret game mode possibility formatting 2016-04-04 19:22:03 +01:00
Yoshax
0c5eb32fef Adjusts reinforced wall construction 2016-04-04 18:39:02 +01:00
EmperorJon
3971b93731 Merge pull request #1347 from Neerti/4/4/2016_hugbox
Removes Head Gibbing
2016-04-04 17:56:47 +01:00
Datraen
3e6c9f8110 Merge pull request #1318 from Neerti/3/31/2016_go_away_icarus
Fixes Icarus reference, when mercs come to the colony with the cloak off
2016-04-04 11:27:55 -04:00
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests
Ports unit tests
2016-04-04 10:34:12 -04:00
EmperorJon
1e20f816ad Merge pull request #1348 from Neerti/4/4/2016_lwap_nerf
Laser Snipers no longer stun on hit.
2016-04-04 15:07:07 +01:00
EmperorJon
daf7c1065e Merge pull request #1349 from Neerti/4/4/2016_communicator_fix
Communicator Fix
2016-04-04 15:06:35 +01:00
Neerti
5b47212f48 Communicator Fix
Communicators now initialize properly, and are no longer invisible until the owner clicks the device in their hand for the first time in the round.
2016-04-04 05:17:07 -04:00
Kelenius
e06df420fc Adds color to unit tests 2016-04-04 11:46:39 +03:00
Datraen
54627608e1 Adds a portables pump station to the station.
* Adds a pump station to the station.

* Adds a digital valve for switching between the canisters and the waste loop.
2016-04-04 04:12:35 -04:00
Neerti
53c16f02bb Laser Snipers no longer stun on hit. 2016-04-04 04:02:52 -04:00
Neerti
8f1e878cb8 Adds variable to disallow gibbing of limbs, checked after the variable to disallow dismemberment.
The head can no longer be gibbed.  Severing the head via sharp weapons remains an option.
2016-04-04 03:42:46 -04:00
Neerti
4eff2f8d10 Merge pull request #1346 from EmperorJon/03_Apr._Jeans_colour_change
Various changes to jeans
2016-04-03 19:27:47 -04:00
Jon
eb0efbf2ef Adds grey jeans, jeans shorts, and jeans shorts (female). Kinda annoyed we have so many variants but that's for another day.
The grey jeans are the black jeans sprite (which are grey...)
The black jeans are now darker! But they still look different from black pants.
The black shorts have had their side-sprites darkened so they look black, not grey, and match the front/back view better.
The new grey variants keep those grey sides and have grey back and fronts too.
2016-04-04 00:07:50 +01:00
EmperorJon
b429c7b7e8 Merge pull request #1345 from Neerti/4/3/2016_fixes_cloaks_and_guns
Firing a gun while cloaked will now unclock you.
2016-04-03 23:34:11 +01:00
Neerti
151082343b Firing a gun while cloaked will now unclock you. 2016-04-03 18:20:07 -04:00
EmperorJon
bdede3c3fd Merge pull request #1341 from Yoshax/lunchboxes
Adds lunchboxes
2016-04-03 20:25:19 +01:00
Yoshax
36c1746f37 Adjusts lunchbox loadout cost 2016-04-03 20:21:19 +01:00
Yoshax
fc845d12af Adds a missing comma 2016-04-03 17:31:51 +01:00
Yoshax
35d8092d98 Further cleans up pathing in file 2016-04-03 17:26:23 +01:00
Yoshax
a7e5116598 Adds lunchboxes 2016-04-03 17:12:01 +01:00
EmperorJon
a118265a4b Merge pull request #1340 from Datraen/PreferenceVerbsPerms
Toggles now save preferences when toggled.
2016-04-03 16:30:07 +01:00
Datraen
a2c4395bad Toggles now save preferences when toggled. 2016-04-03 09:15:01 -04:00
EmperorJon
04da34a08e Merge pull request #1334 from Datraen/BetterMicrowave
Replaces previous microwave hackfix with proper checks.
2016-04-02 23:50:07 +01:00
woodratt
1f3556316d 1.4.9 Hotfix
- Phoron tank in atmos brought back into OSHA non-compliance
- Extra table in the starboard aid station removed.
- Missing air alarms in visitor rooms added.
- Derelict shop area updated.
- Manhack grenade fixed for heist.
- Two of the three spike throwers removed.
- Three new "hair" styles added for Teshari, fixed one broken one.
- Toxins mixing chamber now starts airless.
- Framework in place to allow for a custom item (white cane)
- Fixed access restrictions on riot control maintenance door.
- Firelock added to CE's office door. Entryway from the CE's office to the monitoring room added.
- Fixed a camera in the detective's office.
- Anchored the exonet node on T-comms.
- Fixed Dufflebag in hand sprites.
2016-04-02 15:44:37 -07:00
Datraen
ae18758550 Replaces previous microwave hackfix with proper checks.
Previously a second list was used, rather than a proper removal of the components_list. The procs were restricted rather than checking for if it was a machine and proceeding appropriately.
2016-04-02 18:39:34 -04:00
Datraen
39e5834692 Lowers requirements for the new game modes. 2016-04-02 15:13:54 -04:00
Yoshax
aa974b5597 Revert "Implements new role playing opportunities" 2016-04-02 18:32:41 +01:00
Yoshax
270b7d3b36 Revert "Mimes" 2016-04-02 15:40:19 +01:00
Yoshax
a6cae619f7 Corrects error 2016-04-02 00:00:23 +01:00
Yoshax
96aca20e41 Adds mimes and updates changelog 2016-04-01 23:59:58 +01:00
Yoshax
28621e8e59 Implements the prestigious job of clown 2016-04-01 23:40:43 +01:00
Datraen
459f70ba46 Merge pull request #1319 from Mark9013100/3/31/2016medweb
Adds the medical webbing
2016-04-01 16:53:58 -04:00
Neerti
983192bf11 Merge pull request #1315 from Datraen/PrefVerbsPerms
Updates Preference Permissions, Re-adds Verbs
2016-04-01 16:53:52 -04:00
EmperorJon
7930557e01 Merge pull request #1314 from Neerti/3/31/2016_research_borg_fix
Fixes Research Module's Analyzer
2016-04-01 19:09:38 +01:00
Mark9013100
f51a350281 Adds the medical webbing 2016-04-01 08:11:23 -04:00
Mark9013100
d637e6bc8e Janitor Edits 2016-04-01 04:55:39 -04:00
Neerti
0618dafb42 Removes the Icarus, as they're realllllly far away now. 2016-03-31 22:33:51 -04:00
Atlantis
b239cf4b19 Adds synthetics to the crew manifest
- Synthetics now show on the crew manifest properly. This might as well be a bug fix since they already had the category, it just didn't work at all, since they don't have official security/medical/employment records.
- This does not mean synthetics are part of crew. They just show on the crew manifest for the sake of knowing who is in game when you are joining. I often saw people join a specific position, only to see that all work has already been done by a cyborg.
- As a note, Syndicate/Combat module cyborgs don't show on the manifest. Emagged cyborgs do show, however.
- This does not (probably) support the PDA manifest (which is currently broken anyway)
- Example screenshot: http://i.imgur.com/RSPuuom.png

🆑
rscadd: Cyborgs and the AI now show on the crew manifest.
:/cl:
2016-03-31 17:25:28 -04:00
Neerti
9c28a46030 Merge pull request #1304 from EmperorJon/30_Mar._Age_limit
Command age limits
2016-03-31 17:18:13 -04:00
Datraen
dfd6341376 Merge pull request #1298 from Mark9013100/3/30/2016detedits
A few Detective edits
2016-03-31 17:16:50 -04:00
Datraen
76ae987f2f Merge pull request #1233 from Neerti/3/23/2016_mostly_armblade_additions
Armblade Additions plus One Other Thing
2016-03-31 17:14:55 -04:00
Datraen
91a6c51ed2 Adds toggle verbs and procs. 2016-03-31 16:42:13 -04:00
Neerti
0aa252825a Armblade Additions plus One Other Thing
Armblades can now force depowered or broken airlocks, firelocks, and blast doors, just like a crowbar.
Armblades can slash APCs to cut all the wires.  Fixing the damage is as simple as mending all the wires.
Cleans up the fireaxe wielding check in airlock.dm
Removes colon cancer in blast_door.dm
Not armblade related: Self Respiration is now a free passive ability instead of costing one genome.
2016-03-31 16:39:10 -04:00
Neerti
453249d7a0 Merge pull request #1302 from Yoshax/newloadoutcolors
Now possible to tweak colors of loadout items.
2016-03-31 16:33:38 -04:00
PsiOmegaDelta
f7bd00521b Preference logic tweaks.
Reduces copy-paste. Adds the ability to easily toggle settings.
No functional changes otherwise.
2016-03-31 16:31:24 -04:00
Datraen
41996815ae Gives categorization to the preferences as per the current staff structure. 2016-03-31 16:30:13 -04:00
Neerti
6d7b4bfd9f Corrects issue in cherrypicking. 2016-03-31 16:29:48 -04:00