Commit Graph

5414 Commits

Author SHA1 Message Date
Datraen
dcf2e5cb6b Fixes the hang up button. 2016-01-24 23:12:53 -05:00
Zuhayr
ab9574ee06 Fixing some infinite loops in gun update_icon() calls. 2016-01-22 04:27:00 +10:30
Zuhayr
0a2cf6ad46 Converted two-handed weapons to use the same wielding mechanic as guns. 2016-01-21 01:40:40 +10:30
Zuhayr
f89948d666 Added functionality for two-handed gun use. 2016-01-21 00:51:54 +10:30
Neerti
02b8599123 Merge pull request #739 from Datraen/Trayfix
Allows trays to drop their items, adds color to material items on trays
2016-01-15 22:40:54 -05:00
Datraen
460075b360 Slight optimization in dropped, adds colors to material items. 2016-01-14 18:29:49 -05:00
Zuhayr
a4ac982d79 Merge pull request #772 from Mark9013100/1/12/2016portafreezer
Adds portable freezers to med lockers
2016-01-14 07:39:44 +10:30
Datraen
daeba35c6d Merge pull request #778 from Zuhayr/polaris
Fixes.
2016-01-13 14:18:24 -05:00
Datraen
075343c62d Gives implants show_messages access. 2016-01-13 12:48:09 -05:00
Zuhayr
d0717791dc Fixes #270 2016-01-14 00:33:31 +10:30
Zuhayr
c0889f09e0 Fixes #728 2016-01-13 23:59:12 +10:30
Mark9013100
21778fc92e Adds portable freezers to med lockers 2016-01-12 19:23:25 -05:00
Neerti
cbdff5d241 Merge pull request #746 from Datraen/TeleCrystal-Item2
Gives telecrystals tech levels, restores PDA default to new PDA.
2016-01-12 01:17:17 -07:00
Zuhayr
0c2ec6422a Merge pull request #727 from Mark9013100/1/3/2016edits
Edits/Changes, 1/3/2016
2016-01-12 04:31:38 +10:30
Mark9013100
1bf73936cd Removes the maintenance access I added to Medical Doctors. 2016-01-08 23:16:59 -05:00
Datraen
e77a06e176 Merge pull request #748 from Zuhayr/prosthetics
Blindness fix.
2016-01-08 23:09:03 -05:00
Zuhayr
905cb5943d Readds blindness removal to imida
zoline and organ surgery. Stops imidazoline healing robotic eyes.
2016-01-09 13:24:46 +10:30
Datraen
ee8b26b942 Gives telecrystals tech levels, restores PDA default to new PDA. 2016-01-08 18:06:45 -05:00
Zuhayr
baf1e4315e Generalized pulling restrictions to mob level. 2016-01-08 23:20:30 +10:30
Zuhayr
4ab3daf318 Generalized w_class to obj level, defaulting to null. 2016-01-08 23:19:23 +10:30
Datraen
5699306cf3 Trays now drop items properly 2016-01-07 20:31:05 -05:00
Hubblenaut
61e31ab8ad Wheelchair fixes 2016-01-05 00:56:57 +01:00
Mark9013100
91f191e800 Edits/Changes, 1/3/2016 2016-01-03 20:21:34 -05:00
Neerti
beb54f906a Merge pull request #724 from Datraen/Telecrystal-Item
Telecrystal item implementation + More
2016-01-03 13:57:11 -05:00
Datraen
9c89f9db1b Drops telecrystal from inventory prior to qdel for icon updating purposes. 2016-01-03 04:04:16 -05:00
Datraen
c11e2c5de7 Generic name of telecrystals to lower case. 2016-01-03 03:58:49 -05:00
Zuhayr
bda43c7457 Merge pull request #713 from Woodratt/1.4.0_Extinguisher_fix
1.4.0 Fire extinguishe fixes and tweaks
2016-01-03 19:20:56 +10:30
Datraen
6df5225059 Adds comments, changelog. 2016-01-03 01:27:44 -05:00
Datraen
37e1913fda Creates telecrystal item for exchanging telecrystals between antags. 2016-01-03 01:22:48 -05:00
Datraen
8e70e4e91a Merge pull request #709 from SinTwo/New_PDA_Sprites
New PDA Sprites
2016-01-02 23:29:36 -05:00
Neerti
110593be86 Fixes intercom bug
Fixes #718
2016-01-02 14:03:06 -05:00
PsiOmegaDelta
2e89b7c718 Fixes the canUnEquip() proc.
It now only checks state, it doesn't change it. Fixes a number pf odd item/bag interactions.
2016-01-02 16:59:16 +01:00
Zuhayr
447d0e74ce Added a colour selector to the floor painter, added the floor painter to the construction and drone modules. 2016-01-02 07:05:45 +10:30
woodratt
300cafd987 1.4.0 Fire extinguishe fixes and tweaks
- Tweaks the amount that fire extinguisher holds and particles they send out. According to Spookerton there's no advantage to having more than 3 particles. In tests this seems to be the case as well.
- Also a minor edit to the code for patting people out that are on fire (as suggested by Spookerton), should help with folks that get set on fire.
- Added more fire extinguishers through medical.

-- One note -- Found in testing the fire extinguishers, water on tiles does not go away over time. Fire extinguishers appear to spray water on the tiles. Didn't know a way around this or how to fix this.
2015-12-31 20:57:18 -08:00
Neerti
fd3b91650f Merge pull request #711 from Zuhayr/polfix
May fix massive lag issues with autofire guns.
2015-12-31 21:12:12 -05:00
Zuhayr
3044496ae9 Attempting to limit object checks. 2016-01-01 12:25:30 +10:30
SinTwo
3eb9bfb45c PDA Update Fix. 2015-12-31 18:22:47 -05:00
SinTwo
b0916167c0 Adds new PDA sprites. 2015-12-31 15:19:11 -05:00
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
Zuhayr
9df402b0de Fixes issues with burn repair surgery for robolimbs. 2015-12-25 08:50:58 +10:30
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
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
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
Mark9013100
cbbafa5170 Adds the black scrub cap 2015-12-21 12:25:43 -05:00