Commit Graph

223 Commits

Author SHA1 Message Date
phil235
78d28a6d64 Merge branch 'master' of https://github.com/tgstation/-tg-station into BigUserdanger
Conflicts:
	code/modules/events/ninja.dm
2015-03-15 12:30:27 +01:00
Cheridan
12f5f6ae20 Merge pull request #8290 from Ahammer18/droneassfinal
Drone asses!
2015-03-13 13:57:43 -05:00
phil235
29609457f5 Makes the message when you're attacked slightly bigger for better visibility."
Changes two "for... show_message()" into "visible_message()".
2015-03-12 23:15:54 +01:00
Ahammer18
aa2cf3c469 Added drone asses 2015-03-10 20:35:11 -05:00
Xhuis
9eddc94ccd fixes args 2015-03-07 21:23:01 -05:00
Xhuis
71e2f745d4 Update paper.dm 2015-03-07 21:22:08 -05:00
Xhuis
7ac05bc3fd Fixes ogresight + removes burntime var 2015-03-07 21:13:18 -05:00
Xhuis
b2d5c9c3c2 Allows paper burning 2015-03-07 20:59:14 -05:00
Jordie0608
541b8b30c2 fixes warning on compile 2015-02-25 16:28:21 +11:00
Remie Richards
b1ff6b7220 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyParams
Conflicts:
	code/game/turfs/simulated/floor/light_floor.dm
2015-02-24 22:16:53 +00:00
phil235
2d5fe2b41e Merge pull request #7922 from Mandurrrh/clownbugs
Fixes #7910 and #7909 clown related bugs.
2015-02-24 18:56:30 +01:00
Mandurrrh
e03d98786b Fixes #7910 and #7909 clown related bugs. 2015-02-22 20:53:39 -05:00
Mandurrrh
fa0fa08171 Fixes #7877 Sleepypen bug. Pen only injected 50 of the 55 units. 2015-02-22 12:14:14 -05: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
Kraseo
08e7911f57 fixes a bunch of bugs 2015-02-08 13:27:55 +01:00
Swag McYolosteinen
f5359aba3b Merge pull request #7257 from Lo6a4evskiy/Sec_record_photo
Adds photos and some other stuff to security and medical records
2015-02-05 18:45:53 +01:00
dannno
c48bf44a47 framework for a future "suicide hotline" job 2015-02-01 19:44:54 -05:00
Swag McYolosteinen
d2f2a8a2bd Merge pull request #7381 from phil235/AIPicturePrintTypo
Fixes typo in AI picture printing message
2015-01-28 14:45:04 +01:00
phil235
e159cf0498 Fixes typo in the message the AI gets when attempting to print a picture when it has none. 2015-01-26 20:06:07 +01:00
Deantwo
0e8156814f Font Define'ers Renamed
- Renamed font define'ers.
- Removed font duplicate define'ers.
2015-01-24 17:32:17 +01:00
Deantwo
c05dc2a350 Cancelling Paper Input Fix
Small fix to make the proc return rather than execute with an empty
input.
2015-01-24 16:20:27 +01:00
Deantwo
bfea67611e Pencode Changes Cleanup
- Moved the "parsepencode" proc from **newscaster.dm** and **PDA.dm** to
**text.dm** as a global proc.
- Made the "parsepencode" proc accept only a single agrument if desired.
- Removed the font constants from **newscaster.dm**, **PDA.dm**,
**paper.dm**, **paperbin.dm**, and **photocopier.dm**.
- Replaced aforementioned constants with define'ers in **misc.dm**.
2015-01-24 16:07:13 +01:00
Ergovisavi
cdc1a3194a Merge pull request #7095 from Miauw62/assthecopying
Makes photocopiers less exploitable.
2015-01-23 13:44:18 -08:00
Lo6a4evskiy
3619ed4c0d Merge branch 'master' into Sec_record_photo
Conflicts:
	code/modules/mob/living/silicon/silicon.dm
2015-01-21 21:26:46 +04:00
Lo6a4evskiy
a22d1ecfe2 Adds photos and species to security and medical records, plus some other tweaking 2015-01-21 21:21:47 +04:00
Deantwo
ec49b6d724 Paper Name Limit
- Added arguments to the stripped_input call.
-- usr, no idea why it worked without this.
-- MAX_NAME_LEN, so you can't make paper with super long names.
2015-01-21 13:13:13 +01:00
Swag McYolosteinen
ad6a4a6722 Fixes reversed photocopier wrenching messages & phasing through walls. 2015-01-20 18:06:50 +01:00
Deantwo
0e150ced74 Paper Input Box Fix
- Created a copy of stripped_input called stripped_multiline_input that
does the same, expect it is a multiline input.
- Makes the writing input box multi-line again.
- Renaming paper now uses the stripped_input.
- Fixes https://github.com/tgstation/-tg-station/issues/7132
2015-01-19 17:13:08 +01:00
Iamgoofball
b83ca5f8d1 Goon Chemistry: Addiction and Overdosing 2015-01-18 21:50:54 -08:00
Swag McYolosteinen
52b6ff873f Fixes photocopiers trying to divide people by five. 2015-01-17 19:03:41 +01:00
Swag McYolosteinen
1dd019ab32 Removes a duplicate AM.density check. See previous commit. 2015-01-16 17:00:02 +01:00
Miauw
4081830df0 Fixes #6544. Makes photocopiers less exploitable.
- Adds a delay to (un)wrenching and putting people on photocopiers.
- You can no longer put people on photocopiers if there are other dense things on the same tile.
2015-01-15 18:52:52 +01:00
carnie
a3f5e7ebfd Merge branch 'master' of https://github.com/tgstation/-tg-station into SubSystems
Conflicts:
	code/game/gamemodes/setupgame.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/reagents/Chemistry-Machinery.dm
2015-01-04 01:52:14 +00:00
carnie
a029a49392 SubSystem rewrite
Misc:

+Fixes unreported issue with initializing lighting on a specific zlevel

+Fixes two similar issues with moveElement and moveRange. Where fromIndex or toIndex could be adjusted incorrectly in certain conditions. Potentially causing bad-sorts, or out of bound errors.

+Rewrites listclearnulls(list/L) to no longer iterate through L.len elements for every null in the list (plus 1). i.e. went from L.len*(number_of_nulls+1) list-element reads (best-case), to L.len list-element reads (worst-case)

+New proc/getElementByVar(list/L, varname, value) which finds the first datum in a list, with a variable named varname, which equals value. You can also feed it atoms instead of lists due to the way the in operator functions.

+Fixes an unreported issue with Yota's list2text rewrite. Under certain conditions, the first element would not be converted into a string. Causing type-mismatch runtimes.

+New global map_ready variable. This is not fully implemented yet, but will be used to avoid duplicate calls to initialize() for map objects.

+All turfs now maintain references to all lights currently illuminating them. This will mean higher memory use unfortunately, due to the huge number of turfs. However, it will speed up updateAffectingLights significantly. I've used list husbandry to reduce baseline memory usage, so it shouldn't be any worse than some past atmos modifications memory-wise.

-Removed 'quadratic lighting', can add this back at some point. Sorry.

+modified the way lum() works slightly, to allow turfs to have overridden delta-lumen. i.e. space cannot be illuminated more than its default ambiance. This allowed removal of some iffy special-snowflake lighting areas implemented by somebody else.

+Lighting images in the dmi can now use arbitrary naming schemes. It is reliant on order now. This allows the dmi to be replaced by simply dropping in a new dmi.

-Removed all subtypes of /area/shuttle. Shuttles now create duplicate 'rooms' of /area/shuttle. (More on this later). This will conflict with most maps. Guide on how to fix to follow.

+All verbs/tools relating to world.tick_lag were refactored to use world.fps. However old config text for setting tick_lag will still work (it converts the value to fps for you)

+MC stats improved using smoothing. They now have their own tab so they dont get in the way when you're playing as an admin.

-removed the push_mob_back stuff due to conflicting changes. Sorry Giacom.

_OK, NOW THE ACTUAL INTERESTING STUFF_

Following systems moved over to subsystem datums:
air_master
garbage_manager
lighting_controller
process_mobs (aka Life())
nanomanager
power
sun
pipenets
AFK kick loops
shuttle_controller (aka emergency shuttle/pods), supply_shuttle and other shuttles
voting
bots
radio
diseases
events
jobs
objects
ticker

Subsystems hooks and variables should be commented fairly in-depth. If anything isn't particularly clear, please make an issue.

Many system-specific global variables have been refactored into

All tickers which previously used world.timeofday now use world.time

some subsystems can iterate before round start. this resolves the issue with votes not working pregame
2014-12-31 13:25:41 +00:00
Razharas
9a27fe7c8d Conflict fix
Yeah makes it all work
2014-12-21 06:12:33 +03:00
phil235
d5a7d82959 Fixes a lot of "the the" in messages. 2014-12-16 22:59:55 +01:00
Razharas
21a2c2d21e Made clumsiness into disability
I really dont want to make clumsy_act()
2014-12-14 08:04:48 +03:00
Razharas
0921aa201f Added datum mutations
Also removed some mob vars like sdisabilities and merged the usability
with disabilities
Removed need for mutations var, they are not handled in dna
Removed blinded var, now its handled by eye_blind being bigger than zero
Ands lots, lots of other shit in files that used mutations
2014-12-12 04:48:11 +03: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
3511e0dada Merge branch 'master' of https://github.com/tgstation/-tg-station into Cfour
Conflicts:
	code/game/turfs/simulated/walls.dm

Ye somth liek dat
2014-11-23 17:46:14 +03:00
Razharas
ff456ebaf4 Unwinded most of shit
Meh
2014-11-19 21:36:45 +03:00
tkdrg
0db30a6534 Fixes issues with TK teleporting pictures and harvested plants. 2014-11-18 15:49:03 -03:00
Menshin
b77e2fc46a Conflicts solving 2014-11-04 20:24:52 +01:00
phil235
128c9222e5 Adding checks for stun, restrained to many object verbs.
Fixing paper and supply manifest description upon examination.
Fixing being able to adjust jumpsuit while restrained.
Fixing one typo.
2014-11-01 19:18:01 +01:00
phil235
9779600e81 Error message due to being clothed during ass photocopy only appears once now. You can no longer photocopy the ass of alien larvas, they have no ass. Weapon/paper now has a layer of 3 and won't appear in front of mobs. 2014-10-27 20:27:03 +01:00
Hornygranny
95010abae1 changed ishuman to tool user check 2014-10-17 13:08:13 -07:00
Hornygranny
e30bb58e4e nonhumans can no longer write 2014-10-17 10:25:57 -07:00
Remie Richards
e124c29f8d Merge pull request #5201 from Cheridan/permits
Adds Construction Permits
2014-10-17 05:24:37 +01: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
Menshin
8933943b50 Prevent using force pull on paper bins to grab them from the other side of the station. 2014-10-12 01:43:27 +02:00