cyberpresidentvanellope/fulpstation
1
0
Fork 0
mirror of https://github.com/fulpstation/fulpstation.git synced 2025-12-10 18:11:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,103 Commits 2 Branches 11 Tags
91c63cd6029234e5b0dd61b7f278f39963f3d64c
Commit Graph

74 Commits

Author SHA1 Message Date
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
Xhuis
88105318a6 Defines allowed books in main bookcase define 2014-12-31 23:08:23 -05:00
Xhuis
c17e25aafa Polishes code with lists 2014-12-31 22:00:08 -05:00
Xhuis
a003cdc347 Lets you put hollowed books in bookcases 2014-12-30 19:18:08 -05:00
Iamgoofball
8c2df5fc4f adds a commemorative comment as per request by Miauw 2014-12-30 13:57:13 -08:00
phil235
de336b5db4 derp 2014-12-30 21:53:54 +01:00
phil235
1dd8be6ca6 Added circuitboard design for library console 
Removed debug message and fixing two lines
Added a changelog.
 2014-12-30 21:37:43 +01:00
phil235
9c5c01fb6f Changed library consoles into actual computers. 2014-12-30 17:11:20 +01:00
Xhuis
27e3640bdd Fixes monkeys being able to read books 2014-12-14 13:06:33 -05:00
Hornygranny
af3f1aa4d8 Merge remote-tracking branch 'remotes/upstream/master' into emagrefactor 
Conflicts:
	code/game/machinery/deployable.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/mob/living/silicon/robot/robot.dm
 2014-12-09 16:03:45 -08:00
Razharas
7758a0afed Ok now explosions shall work properly 
Changed severity to target, make items not destroy themselves on
severity lower than 1, all that stuff
 2014-12-05 23:21:48 +03:00
Razharas
84e69cff6b Conflict resolve 
Damn cables
 2014-11-24 12:27:53 +03:00
tkdrg
64e5f0b6b9 Fixes wood duplicating exploit with bookcase 2014-11-21 20:54:29 -03:00
Hornygranny
678a13c451 moves emag effects from attackby() into atom proc emag_act() 2014-11-20 17:49:06 -08:00
Razharas
ff456ebaf4 Unwinded most of shit 
Meh
 2014-11-19 21:36:45 +03:00
Razharas
b071a0167e Made explosions work in a slightly different way 
Yep
 2014-11-18 16:22:41 +03:00
Menshin
b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00
phil235
cf9b07c19e You can no longer start printing a book with the book binder is it's already busy printing one. 2014-10-27 18:56:50 +01:00
phil235
1ed3d50db2 Fixes the book changing icon when carved. 2014-10-21 23:51:41 +02:00
Menshin
26f70fd9aa * Completed the _strip_html_properly_ proc to also limit the length of the text 
* Removed uses of _strip_html_simple_
* Replaced input or redondant trimming/text_copying with the new unified _stripped_input_
 2014-10-15 16:00:22 +02:00
hornygranny
810b4d50f6 bookcases no longer opaque 
considering they are mostly empty they shouldn't be totally opaque, it's awkward in game
 2014-10-04 18:28:30 -07:00
Swag McYolosteinen
d9ee81bb96 Merge pull request #4815 from phil235/AudibleMsgFix 
Simplifying audible messages
 2014-09-27 15:01:56 +02:00
MrStonedOne
e21ed011af Fixes some erros in the database system 
Replaces erro_ with a configurable table prefix system
Defaults to erro_ if not configured, but configuation files default to SS13_
 2014-09-19 13:37:58 -07:00
phil235
d8c78cfa49 Adding say_quote() to library console and supply computers. 2014-09-16 19:50:54 +02:00
phil235
8d6ee69a36 Fixing issue where people can't hear their own emotes while inside lockers and the audible messages when also in the dark. Removing object_talk() proc (obsolete). 2014-09-14 16:17:16 +02:00
phil235
87d7c9e91e Create the audible_message() proc to replace most instance of " for(var/mob/M in hearers(...) show_message(..., 2)" 
fixing typos and missing emotes in emote lists.
 2014-09-14 01:15:15 +02:00
Firecage
40de38f252 moremoarmoaaaaarabsolutes 2014-08-06 16:54:06 +02:00
KyrahAbattoir
1b2c95a81c Merge branch 'master' into ItemNameFixing07-2014 2014-07-31 18:54:38 +02:00
KyrahAbattoir
fcb2fb9de3 Another lowercasing pass on a bunch of items and furnitures. 
Synthflesh should be a plural.
Leg cuffs is better than legcuffs.
LaserTag -> laser tag is not a brand name.
centcom -> Centcom is always capitalised.
 2014-07-27 19:14:40 +02:00
Firecage
ef1cce3c9d Fixes bookcase menu 2014-07-26 17:44:17 +02:00
Hornygranny
d0015287de carved books now turn into storage items 2014-05-16 14:30:04 -07:00
Menshin
80e7d1d0e7 Added a check for "_nodrop_" items for several machines/structures (fix #3407). 2014-04-20 20:49:32 +02:00
Jordie0608
79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
MrPerson
6930283efc Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r 
Conflicts:
	code/game/gamemodes/changeling/changeling_mutations.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/malfunction/Malf_Modules.dm
	code/game/objects/items/weapons/tanks/watertank.dm
	code/game/objects/structures/tables_racks.dm
	code/modules/research/server.dm
 2014-03-21 03:05:39 -07:00
Rockdtben
a034e41f25 Removing TLE comment stamps and useless comments 2014-03-13 08:25:28 -05:00
MrPerson
80a7a2abb4 Replaced a few more Del() and del() calls 
Removed cigarette related reagent deleting. It's already done in atom/Destroy()!
 2014-03-03 04:51:09 -08:00
MrPerson
3c58091437 Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel 
Hopefully nothing went wrong but you never know.

Conflicts:
	code/FEA/FEA_fire.dm
	code/controllers/supply_shuttle.dm
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/machinery/autolathe.dm
	code/game/machinery/drying_rack.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/projectiles/projectile/magic.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/reagent_dispenser.dm
 2014-03-02 21:39:27 -08:00