Commit Graph

133 Commits

Author SHA1 Message Date
PsiOmegaDelta
4286cd959e Resist tweaks.
Can now resist out of handcuffs and buckle restraints. Fixes #12359.
No longer resist out of every possible type of restraint at the same time.

# Conflicts:
#	code/modules/mob/living/carbon/resist.dm
2016-04-12 02:01:50 +01:00
woodratt
ab49ae802a 1.5.0 Striped Socks
- Added green, purple, blue, yellow, red, and orange striped socks. Thigh and knee high options.
2016-04-09 15:20:37 -07:00
Datraen
9c21e0bcdc Manually ports /tg/'s darkclick code.
https://github.com/tgstation/-tg-station/pull/10272 by Razharas.
2016-04-08 23:07:10 -04:00
Datraen
ca24446d7f Merge pull request #1287 from Kelenius/unitTests
Ports unit tests
2016-04-04 10:34:12 -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
Datraen
41996815ae Gives categorization to the preferences as per the current staff structure. 2016-03-31 16:30:13 -04:00
Daranz
2482ddf55a Resolve problem with robot destructive analyzer
CallTechName() was borrowed from destructive_analyzer.dm for reuse in
the portable analyzer.

Resolves #12356
2016-03-31 16:10:07 -04:00
Yoshax
9b7b8656ba Merge remote-tracking branch 'upstream/master' into progressbars 2016-03-30 00:31:03 +01:00
Kelenius
c8b510b415 Adds unit tests
Port of https://github.com/Baystation12/Baystation12/pull/11808 and
several others
Fixes three overlapping cables ([192 / 158 / 1], [214 / 161 / 1], [122 /
197 / 1])
Fixes drill and mech drill having the same ID.
2016-03-29 17:42:22 +03:00
Yoshax
d0d3d3cb16 Merge remote-tracking branch 'upstream/master' into morepreferences 2016-03-27 00:17:24 +00:00
Kelenius
e883863f4b Merge branch 'master' into playingWithTravis 2016-03-23 17:12:11 +03:00
Yoshax
5d9596a72d Makes it possible to have more than 16 preferences 2016-03-21 18:56:27 +00:00
Yoshax
bae4900fc0 Shortens the in-hand check 2016-03-21 17:24:55 +00:00
PsiOmegaDelta
d6797056f2 Adds progress bars to tasks that take time 2016-03-21 17:13:23 +00:00
Datraen
996ce92f7f Merge pull request #1184 from Yoshax/510prep
Ports Byond 510 preperations from Bay
2016-03-20 13:45:40 -04:00
Datraen
fe9d3fd4c4 Merge pull request #1027 from Kelenius/mobCleanup
Changes types of ghosts and eyes
2016-03-18 13:50:47 -04:00
Kelenius
1afd4af7bb Optimizes restart
Cuts 7-8 seconds
2016-03-16 14:49:37 +03:00
Yoshax
8be10d96dd Ports Byond 510 preperations from Bay
Updates comment

Updates supply file
2016-03-14 18:21:44 +00:00
Yoshax
44b8ac218c Adjusts underwear names 2016-03-12 15:57:21 +00:00
Yoshax
ea32fb2bd0 Fixes errors 2016-03-12 01:53:02 +00:00
Yoshax
b2916bbb56 Splits underwear into top and bottom 2016-03-11 19:26:50 +00:00
Kelenius
3fdda5e8c5 Fixes issues travis found 2016-03-11 11:59:51 +03:00
Kelenius
b9a9a7eb88 Merge branch 'master' into botFixes 2016-03-01 14:48:24 +03:00
Kelenius
acc78a8000 Changes types of ghosts and eyes
``/mob/dead/observer`` -> ``/mob/observer/dead``
``/mob/eye`` -> ``/mob/observer/eye``

Reason being that they are similar in that they both don't interact with
the world in any way. Some procs were shared, some checks as well, and
it overall makes more sense this way. Plus, there were no ``/mob/dead``
mobs.
2016-02-20 15:36:05 +03:00
Yoshax
c782297cae Adds 3 new types of underwear 2016-02-18 23:35:32 +00:00
Neerti
2c9a404143 Replaces ugly way of checking for coverage/slots with GinjaNinja32's way. 2016-02-09 10:10:13 -05:00
Kelenius
cf244e07d6 Mulebots are now mobs
obj/machinery/bot removed completely
Mulebot hacking removed, you can still disable their safety.
Mulebot PAD interface redone.
2016-02-02 17:51:50 +03:00
Zuhayr
ed5d041395 Added ceil() macro, replaced n_ceil() as GN said. 2016-02-01 04:12:11 +10:30
Datraen
8e70e4e91a Merge pull request #709 from SinTwo/New_PDA_Sprites
New PDA Sprites
2016-01-02 23:29:36 -05:00
Zuhayr
3044496ae9 Attempting to limit object checks. 2016-01-01 12:25:30 +10:30
SinTwo
b0916167c0 Adds new PDA sprites. 2015-12-31 15:19:11 -05:00
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
woodratt
cbb8a93451 -1.3.2-
- Fixed stripe on xenoarch outpost
- Added in a airlock for toxins to go to the toxins test site.
- Underwear closet added to visitor's laundry.
- Bar code scanner added to the library office.
- Added in missing window pane on detective's office.
- Added in chapel office shutters.
- Fixed leather jacket alt
- White Stockings added.
2015-12-13 17:36:20 -08:00
woodratt
d5dcbebcfd 1.2.8
- Added fishnet stockings
- Added four different boxers
- Added five different female underwear choices
- Added one blue striped shirt
2015-12-10 14:46:46 -08:00
woodratt
aca388d360 Minor Sock additions
- Added striped knee and thigh socks.
- Added rainbow knee and thigh socks.
2015-12-05 00:25:26 -08:00
Jon
85c704676f Updates all get_base_turf usages to get_base_turf_by_area.
This means that instead of the base turf being defined by the z-level, it's now defined by area and defaulted by z-level.

Updates all "shuttle" and "solar" areas to have a base_turf of space.
Updates docking arms 1, 2, and 3 on the main asteroid level to have a base_turf of space.

Other z-levels may still need updating.

This change means that all actions which destroy or dismantle a tile - for example bombs, a singularity, a shuttle leaving, or deconstruction - now leave these new areas as space not asteroid. Future mapping efforts may need to take this into account.
2015-12-05 04:24:17 +00:00
Jon
1a94dea2ea Allows you to define a base turf for an area which overrides the z-level's base turf in unsorted.dm.
It will first check to see if the turf is set, and if not it will still use the z-level default.
This means we can mark areas as having a base of space to override the z-level base of asteroid that we're using.
As a result, we can ensure the bombs, shuttles moving, etc. leave behind an space turf by defining shuttles, solars/"external" areas as using space as a base.
Areas will need to be updated to check with base_turf = /turf/space and references to the old get_base_turf proc updated so all calls (bombs, Nar'Sie, deconstruction, etc.) have the correct effect, but it's tired and I want to commit this now so I'm committed to finishing it tomorrow.
2015-12-03 22:51:15 +00:00
Neerti
78e5701b5c Replaces most instances of Nyx to Vir. 2015-11-26 01:01:06 -05:00
PsiOmegaDelta
df0188662c Character setup tweaks.
Adds client verb to access the character setup screen from anywhere.
Moves name validation to species level, making it possible for IPCs to have numbers in their name.
Adds gender validation, also adds support to add neuter/plural genders in the future if ever desired.
Now sanitizes preferences before applying them to a mob.
Fixes #11433.

(cherry picked from commit e40246e9dfc9feb28b8c5a0a7ce765fd063c4f7e)
2015-11-20 07:50:12 -05:00
Neerti
4f77afece1 Revert 58ef59734f 2015-11-08 10:09:14 -05:00
Neerti
45f15930a0 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into 11/6/2015_neerti_breaks_everything_bay_merge
Conflicts:
	.travis.yml
	code/_helpers/lists.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/global.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/reagents/dispenser/dispenser2.dm
	polaris.dme
2015-11-06 17:41:18 -05:00
PsiOmegaDelta
9d6c99aaf3 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	.travis.yml
	code/modules/mob/living/carbon/breathe.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
	html/changelogs/.all_changelog.yml
2015-10-27 13:08:33 +01:00
PsiOmegaDelta
3db2c4fb49 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
2015-10-27 12:38:28 +01:00
PsiOmegaDelta
299ad9580c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/admin/admin.dm
	code/modules/admin/topic.dm
2015-10-16 13:02:59 +02:00
PsiOmegaDelta
fc4c1d6af7 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/storage.dm
2015-10-16 11:04:43 +02:00
PsiOmegaDelta
3b5990121f Blobs locations are now more random.
Blobs now randomly pick a random turf without obstructions in maintenance, instead of from a pre-determined list of locations.
Blobs also now log their spawn location, which admins can use to jump to it.

Space vines and nuclear discs have been updated to use the same mechanics.
2015-10-13 18:49:55 +02:00
Neerti
bbe8c336b2 Adds socks.
Conflicts:
	code/modules/client/preferences_savefile.dm
2015-10-11 00:13:33 -04:00
Neerti
e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015
Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme
2015-10-10 23:17:26 -04:00
PsiOmegaDelta
aaba2c5c8c Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/modules/mob/living/silicon/robot/robot_modules.dm
2015-10-07 08:14:30 +02:00