Commit Graph

110 Commits

Author SHA1 Message Date
oranges
d89446b42e Merge pull request #18005 from swankcookie/book_length
adds a 20 character limit to book titles
2016-05-29 17:05:33 +12:00
Swankcookie
dae5010ed0 adds a 20 character limit to book titles 2016-05-28 13:45:03 -05:00
phil235
c6d55955e7 let's not have the paper forever stuck in case of power outage. 2016-05-26 22:23:24 +02:00
phil235
ca3cf7475e Book binder machine is now wrenchable to move it. 2016-05-26 22:14:51 +02:00
lordpidey
b4b93bd561 Adds new objective for devils to have X people on station be sintouched. (#17616)
* Adds new objective for devils to have X people on station be sintouched.
Adds spell that causes nearby humans to be sintouched.
Drastically lowers chances of codex gigas sintouching it's reader.

* Fixes a runtime.
2016-05-17 21:37:08 +01:00
lordpidey
24f47b0223 Devil Antag Round 2. (#15794)
* Re-making the branch and PR of demon.  See #15118 for the old PR

* Adds toy demonologist to arcade machine reward list.

* Implemented two suggestions: Pitchfork now has a demonic subtype, to potentially give botanists a normal pitchfork.

Suiciding with signed contract now uses forcesay instead of say.

* Fixes compile errors.
Re factors contracts to be subtypes rather than datums.  <--- incomplete, still need to summon them appropriately.

* buffed infernal power contract to give passive healing
Nerfed magic power contract to not give robeless MM

* Fixes compile errors

* Corrects orientation of true demon sprite

* Begins work on the sNPC for the true demon/ arch-demon

* Added funeral garment sprites.  These will be used in banishment rituals (hopefully)

* Stashing my work so I can move to another computer.

Re-working the true-demon, it will be a carbon rather than a simple mob.

* Revert "Stashing my work so I can move to another computer."

This reverts commit e8b1e032997b7e17af4ad8630bf21d3620195c4e.

* Git exploded for me, so I have to make a new branch with EVERYTHING.  sorry.

* Fixes compile error

* Ghosts can now click on an arch demon to become a slaughter demon

* Begins to convert demons into a carbon rather than simple mob.

* Demons now resurrect if not banished.

* Beepsky now properly tells security chat about the level 666 threat.

* Contracts now work again.

* old spells now get removed properly.

* adding pitchfork sprites

* Adds hud for the true-demon.  Not functional.

* Fixes another error in the demon hud.  Still broken.

* Demons are no longer immortal, demon huds work properly now.  (it's barebones, but it works.)

* Fixes the "Have mortals sign at least # contracts of TYPE" objective

* Fixed typo in banishlore() and updated wrath/envy sintouch objectives.

* Adds huds for demons/sintouched/soulless, however they are currently unused.

* Updates the demon's hud to work with the recent hud changes.

* Cleaned up infernal jaunt, it works a lot better now and is less buggy.

* Revival contracts now actually take your soul.

* Fixes #16513

* Replaces the infinite slaughter demons with infinite imps.  Sprites for imps are still needed.

* Adds sprite for imps.  It's a redder, smaller slaughter demon.

* Fixes lack of icon for pitchforks

* Gives summon wealth a more appropriate icon.

* Fixes small part I forgot to merge.

* Fixes a few bugs with demonic resurrection.  It's still very buggy.

* Derp, my bad, I didn't mean to admin myself on the main server.

* Fixes edge case of demonic resurrection failing.  Debraining the demon is NOT supposed to be an alternative for the banishment ritual.

* Also did not mean to change this config file.

* Fixes another error in type 1 demonic resurrection.  It works properly now.

* Updates employment contract text.

* Fixes type 2 resurrections.
Demonic contracts are once again permanently on fire.

* Replaces toy demonologist with toy demonomicon.  It still works the same, just different icon/name.

* Adds demonomicon and employment cabinet to box/meta/dream/efficiency.

I could not add it to mini/bird due to conflicts.

* Edits ministation and BirdStation to have demonomicons and employment cabinets.

* Fixes spelling error

* Adds burial garments to maps.

* Update photocopier.dm

Fixes the span when inserting items into photocopier

* Fixes disrupt_spells proc

* Makes a lot of changes as reccomended by Remie.

* Fixes a compile error.

* Updates the lawify/loreify to be lists.  Does not compile.

* Fixes compile errors.

* Arch demons no longer regress upon death.
Speaking a demon's truename gives the demon the opportunity to teleport to you.
Makes demonomicon not care about capitalization.

* Fixes startup error.  Demonic summoning now works.  It's very simple, just say their true name.

* Demons now have a tongue.  True demon bodies are deleted upon regression.

* Demons can now be punched.
Demons can no longer resist a fire out, since it does nothing to them.

* true demons show up in player panel.  Hellfire works again.

* Prepares for commit 16940

* Demons are now known as devils.

Still needs testing.

* Oops, didn't commit everything last commit.

* Finishes converting demons to devils.

* Fixes speech for lizards/flymen when they speak a demon's name.

* Update tips.txt

* Changes variable from static to global as per Remie's suggestion.

I disagree with Remie's assessment, as a list that will never change, even between games, seems like it should be static.

* Removes devil summoning.  Hopefully, I'll be able to eventually find a way to implement it satisfactorily, but for now, I'll leave it out.

* Removes carriage returns

* Combined modified icon files

* Fixes #17184

* Imps no longer show up in the end round report.  This is because there can EASILY be 100+ imps if the crew is well armed.

Non-employment filing cabinets no longer take 30 sec to wrench/unwrench.

* The lawyer can actually buy souls back now.  Oops.

* Fixes true/arch devil spritesheet to have correct sprite names.

* Relocates Box's employment cabinet to Law office.

* De-devil-ing someone now removes the devilinfo.
De-devil-ing now returns an error when used on true and arch devils

* Re-factors whiteness code for jumpsuits.

* Merges icons, reverts failed merge of map

* Merges map with CAS decks

* Fixes copying employment contracts

* Derp, fixes compile error.

* Replaces antaghud with customizable vision range for knowledge boon.

* Prevents a runtime if devil is gibbed while ascending.

* Neatens contract code, and removes excess variable from humans.

* Fixes compile errors

* Organizes weakness code slightly.  Adds ability for a species override on weakness.  (Make flypeople take 2x damage from flyswatters for example)

* Removes sixteen erroneous characters from the codebase.

* Removes trailing return

* Makes typeless for loops, removes a runtime, and removes unhelpful comments.
2016-05-08 18:44:27 +01:00
Core0verload
a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02:00
phil235
0caa59b21a First commit of this big PR
These are the files with just tiny tweaks. Mostly modify an object's attackby so it does "return ..()" instead of "..()".
If there are other things in this commit, the PR's description will explain them.
2016-04-24 20:26:24 +02:00
Menshin
9afe050025 Replaced last occurences of gc_destroyed by qdeleted(). 2016-03-05 01:58:56 +01:00
Tkdrg
c8c0f5294f Sanitizes a bunch of num inputs to be integers
This is mostly to plug href exploits causing wacky stuff like NaN.
2016-02-21 12:15:37 -03:00
Nerd Lord
7c8a138f60 Sneaks in a new book sprite that's totally white colored, no blue dot. 2015-12-29 16:01:14 -05:00
Kyle Spier-Swenson
49e112b189 Fixes lib machines spamming refreshes when printing 2015-12-23 14:20:42 -08:00
KorPhaeron
d8a37204e7 Makes burn_state use defines 2015-12-13 05:36:55 -06:00
Kyle Spier-Swenson
0e4c9b79f3 Update lib_machines.dm 2015-12-06 08:40:47 -08:00
Kyle Spier-Swenson
d97bd880b9 Fixes library computers pager...... 3rd time's the charm 2015-12-06 07:48:52 -08:00
Kyle Spier-Swenson
02b4ce079a Fixes library computer's next page not working. 2015-11-30 18:40:42 -08:00
Jordie
da0c466f82 Merge pull request #13149 from Firecage/toolspeed
Adds toolspeed
2015-11-29 21:06:15 +11:00
Kyle Spier-Swenson
184b7ea5ce Fixes library computers thinking they already built their menu 2015-11-22 14:49:29 -08:00
Firecage
c933363062 Adds the toolspeed var and adds it to most usages of tools which has a timer 2015-11-21 19:24:14 +02:00
Cheridan
4c899d2b34 Merge pull request #13063 from Incoming5643/subtypesof
Adds subtypesof(path)
2015-11-19 16:31:09 -06:00
Incoming
1f9f0dfc40 Adds subtypesof(). It's shorthand for typesof(path) - path.
Replaces typesof(path) - path with subtypesof(path) in obvious places. I was a bit conservative, there's probably a few more places that could use this.
2015-11-16 18:55:57 -05:00
Kyle Spier-Swenson
ad2cf316e5 Fixes compile error in library computers from me coding while too high 2015-11-16 13:01:34 -08:00
Kyle Spier-Swenson
405b8b8284 Fixes some more compile errors in library computers 2015-11-15 15:37:36 -08:00
Kyle Spier-Swenson
aa3040003a Fixes library computers missing a var breaking compiling. 2015-11-15 15:18:39 -08:00
Kyle Spier-Swenson
818dc2e9b4 Makes external archive only show pages of 250 books
250 because any less seemed like you would have to page too much to browse the archive.

All actions preserve the current page.

Page splitting and calculation is cached on first load of the external archive for that computer (has to be per-computer because the html is cached and it needs to have the src arg)
2015-11-15 15:13:35 -08:00
Vincent
e4c307af79 You saw nothing 2015-11-01 11:40:14 -05:00
Vincent
8acfb8db3c Grumble grumble doesn't work in new must be in initialize 2015-11-01 11:40:13 -05:00
Vincent
7bb3c14883 Error checking, consolidation, sql sanity 2015-11-01 11:40:13 -05:00
Vincent
c1d3ddb6e7 Adds database-fed random bookshelves. 2015-11-01 11:40:12 -05:00
bear1ake
f697ae90f5 removes a bunch of .0 2015-09-10 20:57:30 +09:00
Firecage
4688c2c969 Fixes proc arguments 2015-07-15 23:52:35 +02:00
Ikarrus
8759f56f6f Squashed Commits 2015-06-27 00:09:16 -06:00
Iamgoofball
a8ec1c76df Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics
Conflicts:
	code/ATMOSPHERICS/atmospherics.dm
	code/game/machinery/computer/computer.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/window.dm
2015-06-23 12:54:26 -07:00
Iamgoofball
a00e11520c Merge branch 'master' of https://github.com/tgstation/-tg-station into graphics 2015-06-14 15:42:15 -07:00
xxalpha
b2e84a0d3c Put drop_item() calls inside ifs. Replaced some drop_item() with unEquip( 2015-06-14 20:11:40 +01:00
Iamgoofball
c2256d41fc BAR NOW SHOWS UP ON THE OBJECT YOU'RE INTERACTING WITH 2015-06-13 13:58:08 -07:00
Jordie0608
5ef93b2225 overlays for computers 2015-06-13 20:07:48 +10:00
Firecage
3a826fe13c Changes alot of datum/ to /datum/ 2015-05-31 02:40:54 +02:00
phil235
752032628f Remove kitchen/utensil/spoon. Changes /kitchen/utensil stuff to simply be /kitchen.
Butchering spiders now is done in one step, not leg after leg. Changed simple_animal/harvest proc.
Kitchen knives are now weapon/kitchen/knife.
Fixes eating omelette with fork.
Changed some code to use is_sharp() instead of multiple type checks (spacevines and leather code).
Removes utensil/knife (we already have kitchen/knife).
2015-04-27 23:54:28 +02:00
kingofkosmos
1d14471d00 Ellipses to waiting messages. Warning-spanclasses to failing messages with an exclamation mark. 2015-04-24 20:50:50 +03:00
Miauw
ba2a1c8f19 Adds a verb_exclaim var. Fixes #8478.
Also makes saymods transmitted through the radio system for upcoming NTSL integration.
2015-03-22 18:55:59 +01:00
Miauw
1873143e63 Initial say cleanup commit. 2015-03-18 19:23:31 +01:00
Remie Richards
5fc7af7fbf attackby() now has an argument containing the parameters of the click that called it. Items placed on tables now center their icon where the user clicked. this is NOT true for racks, since racks look organised in their sprite.
Items reset their pixel_x and pixel_y values on pickup.
2015-02-19 13:02:43 +00:00
MrStonedOne
dda1bd3b2d Merge branch 'lib-sucks-no-homo' of https://github.com/MrStonedOne/-tg-station into lib-sucks-no-homo
Conflicts:
	code/modules/library/lib_machines.dm
2015-02-18 18:26:39 -08:00
MrStonedOne
c0af9cc320 Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo
Conflicts:
	code/modules/library/lib_machines.dm
2015-02-18 18:23:05 -08:00
MrStonedOne
5addddb1d4 Merge remote-tracking branch 'upstream/master' into lib-sucks-no-homo
Conflicts:
	code/modules/library/lib_machines.dm
2015-02-18 18:20:16 -08:00
MrStonedOne
6a9ea4c9ec Ports tkdrg's library computer caching system.
This helps mitigate lag caused by the computer grabbing meta information about almost **two thousand books** over sql on EVERY load of the library computer interface
2015-02-18 18:03:39 -08:00
phil235
f93ee8b99b Fixes book management console and Robotics RnD console dropping a circuitboard not set to the correct computer build_path. 2015-01-14 14:04:21 +01:00
phil235
822f871e5b Merge branch 'LibraryComputer' of https://github.com/phil235/-tg-station into LibraryComputer 2015-01-11 15:55:26 +01:00
phil235
658c82e403 Merge branch 'master' of https://github.com/tgstation/-tg-station into LibraryComputer
Conflicts:
	_maps/map_files/TgStation/tgstation.2.1.3.dmm
2015-01-05 22:17:04 +01:00