Commit Graph

136 Commits

Author SHA1 Message Date
redstryker 2e25267791 Adds SolGov logo to Paperwork and SolGov Stamps 2016-07-21 15:29:08 -04:00
Datraen beda3185eb Reverts the second mob clean up because of incomplete implementation.
This caused an error that would then cause machinery to hang on the server, and was reproduced successfully.
2016-05-04 00:24:55 -04:00
Kelenius df5a0d7941 Mob inventory cleanup
Replaces three item removal procs with one
Adds a proc to delete an item on the mob
2016-03-24 01:23:08 +03:00
Neerti a9ad84da4b Merge pull request #1191 from Kelenius/inventoryCleanup
Mob inventory cleanup
2016-03-22 21:42:27 -04:00
Kelenius afbc235b96 Mob inventory cleanup 2016-03-15 16:39:40 +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
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
PsiOmega 63de1764c3 Merge remote-tracking branch 'upstream/dev-freeze' into dev 2015-09-27 13:48:33 +02:00
PsiOmega 807e7bf954 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/spells/artifacts.dm
2015-09-27 13:36:56 +02:00
HarpyEagle 592c824837 Changes paper and paper bundle gender, plus rename 2015-09-26 20:27:57 -05:00
Kearel 93959dc83d Changelog + scrambled paper 2015-08-13 01:16:00 -05:00
PsiOmega f25e8a7a67 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/modules/materials/materials.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/surgery/implant.dm
	code/setup.dm
2015-06-26 20:28:47 +02:00
PsiOmega 6c891406f9 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mob/update_icons.dm
	code/setup.dm
2015-06-26 19:22:31 +02:00
mwerezak 1b978f9570 Makes update_inv_head() respect item_state and item_icons
Fixes #9873
2015-06-26 01:34:15 -04:00
Mustafa Kalash bb370a66f3 Merge remote-tracking branch 'upstream/dev' into iaasuit 2015-06-20 14:07:44 -04:00
PsiOmega 0a05c2659f All the span-corrected dm files. 2015-06-14 22:08:14 +02:00
Mustafa Kalash cc56480f99 Adds an Internal Affairs hardsuit; adds a mounted pen, stamp, paper dispenser, and flash; maps in the IA hardsuit; and adds a pen which can cycle through the three colors. 2015-06-11 23:31:25 -04:00
PsiOmega 1c38be5cfd Crayons are now children of pens. 2015-05-05 08:41:24 +02:00
volas 93d120a24c merge fix 2015-05-02 11:16:15 +03:00
Zuhayr cc19bbb604 Merge pull request #8972 from DeeUnderscore/paper-functionality
Paper functionality additions
2015-04-29 02:46:21 +09:30
PsiOmega 86d2fa5f61 Build fixes. 2015-04-28 09:04:00 +02:00
PsiOmega f760d44127 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/items/weapons/candle.dm
	code/modules/paperwork/paper.dm
2015-04-28 08:43:31 +02:00
volas 59e17f7a9b small fix 2015-04-28 00:41:14 +03:00
Daranz 8b792b6361 Merge branch 'dev' into paper-functionality 2015-04-27 12:37:31 -04:00
volas 53a95d8eff Fixes #8913 2015-04-25 22:43:50 +03:00
PsiOmega 1fea589ad7 Merge remote-tracking branch 'upstream/dev' into TheSummoning
Conflicts:
	code/game/machinery/cryopod.dm
	code/game/objects/items/weapons/clown_items.dm
2015-04-24 17:13:37 +02:00
PsiOmega 1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Daranz 1bd25c54e3 Add random access inserting into paper bundles
You can now insert papers into paper bundles by clicking on the next page or
previous page link with a sheet of paper in hand.

The bundle window also now correctly updates when the bundle is in a folder.
2015-04-23 21:49:56 -04:00
Daranz ad51379d86 Make papers in a clipboard renameable without removing 2015-04-23 08:48:52 -04:00
PsiOmega a4fbb01e2b Makes it possible to write [date] and [time] to get the current date and time in ISO 8601 format. 2015-04-18 18:40:35 +02:00
volas 2f8bc856a5 Small fix after merge 2015-04-09 21:07:43 +03:00
PsiOmega 71a8ddf50e Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/gamemodes/cult/runes.dm
	code/modules/paperwork/paper.dm
	code/modules/projectiles/projectile.dm
2015-04-08 10:55:26 +02:00
PsiOmega 66c56926d0 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/game/gamemodes/cult/runes.dm
2015-04-08 10:40:38 +02:00
volas ef105f0659 Additional checks for paper work 2015-04-04 23:47:22 +03:00
volas 31360a344b merge fix 2015-03-25 01:13:23 +03:00
volas e3d41c3112 Merge remote-tracking branch 'upstream/dev' into sanitize_procs 2015-03-25 01:06:32 +03:00
PsiOmega bd48c76620 Merge remote-tracking branch 'upstream/master' into dev-freeze 2015-03-23 21:14:32 +01:00
Chinsky a9ee51bc64 Readded missing check for paper editing
Removed it back when HTML in paper was a thing again adn never put back in, can possibly cause issues.
Thanks @volas for noticing.
2015-03-23 23:02:43 +03:00
volas 855755f808 sanitize() refactor: first pass (sanitize) 2015-03-22 23:31:19 +03:00
mwerezak e840ba2d25 Fixes photocopier runtime 2015-03-09 12:12:31 -04:00
volas 8abd7d0735 correction of all copytext(sanitize(..)) to sanitize(copytext(..)) 2015-02-01 22:54:56 +03:00
PsiOmega 2e34cb79a5 Morphic Clerical Kit
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
Loganbacca 224b2f3899 Duct Tape
First pass for adding duct tape.
It can stick paper to things.
It can patch up walls (crudely).
Coder sprites!
2014-12-02 23:17:45 +13:00
PsiOmega 0f8156e77e Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/game/objects/structures.dm
	code/game/objects/structures/inflatable.dm
2014-11-29 10:09:03 +01:00
mwerezak ff8b57b8c0 Fixes #7144 2014-11-27 23:31:40 -05:00
Amunak 245a4f142d Whitespace changed by saving in DreamMaker 2014-11-26 16:24:51 +01:00
Amunak a104c199a7 Renaming paper to its original value will now revert it to initial, not just 'paper' 2014-11-26 16:24:10 +01:00
Amunak bfe738cf8d Ghosts can view paper from anywhere, improved the 'far' message 2014-11-26 16:21:38 +01:00
Amunak 319e3abd27 Papers will now have a nice description like every other item 2014-11-26 16:20:32 +01:00
mwerezak 348c9d19f7 Merge remote-tracking branch 'upstream/dev' into faxmachine
Conflicts:
	code/WorkInProgress/kilakk/fax.dm
	code/modules/paperwork/faxmachine.dm
	code/modules/paperwork/paper.dm
	code/modules/paperwork/paper_bundle.dm
	code/modules/paperwork/photocopier.dm
	maps/tgstation2.dmm
2014-11-20 14:57:35 -05:00