Commit Graph

6438 Commits

Author SHA1 Message Date
Cheridan 8442298336 you got some red on you 2014-04-09 22:08:25 -05:00
MrPerson 910dae4154 Make reenter-corpse not delete your spells 2014-04-09 13:10:48 -07:00
Cheridan 2b64683a6b Refactors pAI law code to use the inherited laws datum instead of its own specific variables
Removes annoying double-message box when selecting NEVER FOR THIS ROUND.
Span classes
2014-04-09 12:38:22 -05:00
Daniel 30bb6c8814 Generalised ID naming 2014-04-09 18:49:59 +02:00
AndroidSFV 50cd395c4f Merge branch 'master' of https://github.com/tgstation/-tg-station into aiphotoext2
Conflicts:
	code/datums/wires/robot.dm
	html/changelog.html
2014-04-08 09:28:42 -05:00
Razharas 4e7ac41ba4 Merge pull request #3346 from Iamgoofball/FUCKMONKEY
Removes a bunch of ticker.mode.name == "monkey" checks, since monkey doesn't even exist anymore
2014-04-07 18:30:30 -07:00
Cheridan c9bd6c3688 Merge pull request #3296 from Ikarrus/alarmdelay
Alarm Delay Reduction
2014-04-07 14:04:50 -05:00
Kelenius 3b67f683a8 Stay command (untested) 2014-04-07 16:15:47 +04:00
iamgoofball 810b91e7ac removes a ton of things checking the ticker to see if it's monkey, a gamemode that no longer exists. 2014-04-06 11:46:12 -07:00
Giacomand e41dd607b5 Better comment. 2014-04-06 14:27:28 +01:00
Giacomand cb4e338318 Fixes a bug with Cyborgs losing their emag module if they were emagged as a default cyborg and they transform. 2014-04-06 14:07:09 +01:00
Miauw62 ab181299dd Merge pull request #3279 from fleure/braid
Fixes floorlength braid sprite
2014-04-05 18:48:02 +02:00
Kelenius 1be7f9e8d7 Faces and refactoring 2014-04-05 20:46:24 +04:00
Miauw62 39a077761c Merge pull request #3264 from Menshin/Wizarditis_and_inv
Fixed "update inventory X" procs and clothes from wizarditis not showing
2014-04-05 18:43:40 +02:00
Kelenius ae1939167b Can talk to specific slimes 2014-04-04 19:41:06 +04:00
Kelenius 06e151c1ad Making them talk and reply (test version) 2014-04-03 11:39:04 +04:00
ikarrus 51769a1697 Alarm Delay Reduction
Reduced motion alarm delay from 10 to 3 seconds.
Reduced alarm display delay from 10 to 3 seconds.

This means that motion cameras will only take 6 seconds to report an intruder instead of 20+
Other alarms (camera, fire, atmos) will be reported after 3 seconds instead of 10.
2014-04-02 22:47:22 -06:00
ikarrus f46cb302a4 Updated to work with newer cyborg code. 2014-04-02 22:12:36 -06:00
ikarrus f705141fce Resolved Conflicts:
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06:00
Miauw 1b10254a25 Reverts my and Incoming's April Fools 2014-04-02 20:03:17 +02:00
fleure 19f7c691d6 Fixes floorlength braid sprite 2014-04-02 15:38:17 +01:00
Aranclanos 6936a1a32c the stars() proc will now use the html_decode()
this fixes the html fuck-ups when a human talks and an alien receives weird text in the middle of the "***".
2014-04-02 09:49:45 -03:00
Miauw62 24e1e89afb Merge pull request #3260 from Incoming5643/Realism
Minor fix to improve realism
2014-04-01 19:55:33 +02:00
Menshin f411ccaad6 * Fixed the update_inv_* functions to actually update the inventory HUD even if the inventory is closed (that should fix items presents in the inventory but invisible).
* Fixed clothes from wizarditis not appearing on character and inventory.
2014-04-01 19:33:38 +02:00
Incoming af47580b20 Humans Named John McClane can crawl through the vents.
This helps increase realism and believability in our 2D spessman games.
2014-04-01 12:45:28 -04:00
Razharas f618fe556e Merge pull request #3241 from Miauw62/aprilfools2014ian
April fools
2014-04-01 05:54:22 -07:00
Jordie0608 79746e115f Wooden Walls 2014-04-01 18:03:02 +11:00
Cheridan 302f2ea122 Merge pull request #3215 from MrStonedOne/silicon-macros-and-hotkeys
Gives cyborgs ai click shortcuts, adds some click shortcuts, and gives borgs more meaningful hotkeys
2014-04-01 01:27:39 -05:00
Aranclanos 6c1150dca3 Merge pull request #3143 from Malkevin/saccult
Sacrifice Cult
2014-04-01 02:18:39 -03:00
MrStonedOne 25fe463eb2 Ensures re-humaned cyborgs get normal macros. 2014-03-31 22:04:33 -07:00
Cheridan 222f769b0c Merge pull request #3091 from Incoming5643/diehardwithaventgeance
Fixes #3084
2014-03-31 21:39:32 -05:00
Malkevin a35f993c69 Changed the fast move code from a bunch of has_reagents checks to a bitflag check.
The reagents turn on the flag per on_mob_life proc run, the flag is turned off if a check for the reagents fails, the check is called when reagents are deleted
2014-04-01 00:50:42 +01:00
Malkevin 0725ba44a4 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult 2014-03-31 22:17:24 +01:00
Incoming 335c4591ad Just uses Login() 2014-03-31 13:30:19 -04:00
Razharas d1fbcf2457 Merge pull request #3227 from fleure/tankfix
Watertank nozzles no longer delete
2014-03-31 09:48:57 -07:00
Miauw 83176c5ee2 improves le corgis immensely xd 2014-03-30 20:06:06 +02:00
Malkevin d4e0052d03 mob.dm 2014-03-29 17:05:34 +00:00
Malkevin c3552606f1 Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
Conflicts:
	code/modules/mob/mob.dm
2014-03-29 16:59:14 +00:00
Razharas 6cb3ae5183 Revert "Merge pull request #3142 from Alek2ander/master"
This reverts commit 6f9b58abce, reversing
changes made to eda7110a23.

Im so sorry aran, so sorry
2014-03-29 18:02:54 +04:00
Razharas e63a01aff0 Merge pull request #3220 from Rockdtben/fixFollowBug
Fixes #2852
2014-03-29 06:26:06 -07:00
Razharas 6f9b58abce Merge pull request #3142 from Alek2ander/master
pAI remote computer control
2014-03-29 06:18:22 -07:00
fleure c55ddd9d70 Watertank nozzles no longer delete 2014-03-29 12:35:58 +00:00
Cheridan c8da962b40 Merge pull request #3195 from MrPerson/qdel_ei_nath_REDO
Make ei nath not destroy brains again
2014-03-28 13:03:11 -05:00
Rockdtben 5f54c9535b Fixes #2852 2014-03-28 07:59:15 -05:00
AndroidSFV 40119ada0c AI Photography Extention #2
Gives the ability to take and view photo to Cyborgs

AI's share their photo album with connected Cyborgs, and connected Cyborgs have the pictures they take saved to the AI's album. If a Cyborg is not connected to an AI, photos are saved to the Cyborg's camera object. If a Cyborg has photos in it's album while not connected to an AI, but is subsequently connected to an AI, the photos are added to the AI's album. This is initiated by pulsing the appropriate wire on the borg.

Cyborgs can attach images to newscaster feeds, from the active album available to it (the AI's, or its own if disconnected)

Cyborgs cannot interact with photocopiers, but however have become a moving printer. They are every inefficent at printing, and thus can only print two color pictures before needing to be refilled with toner (simply click on them with toner in active hand).

Added some span classes to the previous AI photography work.

One minor bug fix to photocopier which could result in a photo object ending up in the 'hand' of an AI or cyborg.
2014-03-28 07:31:14 -05:00
Malkevin 3ff519cefc Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
Conflicts:
	code/modules/mob/mob.dm
2014-03-28 10:51:48 +00:00
Razharas 3000586e7b Merge pull request #3216 from Aranclanos/ClickDownRemoval2
Click cooldown removal take 2
2014-03-28 02:39:25 -07:00
Aranclanos 7bcb69ad88 Removes the click cooldown from almost everything, now it should be always be 0.1 seconds.
Ranged weapons and laser eyes have a cooldown of 0.4.
Grilles, windows, windoors, walls and blobs have a cooldown of 0.8.
Hitting mobs will also have a cooldown of 0.8.
Removes the unused USEDELAY flag.
2014-03-28 06:32:47 -03:00
MrStonedOne a26b2252a0 borgified hotkeys for borg players
changed:
1-3 = module select/toggle
4 = toggle intent
q = unequip active module

changed hotkey help to reflect this for borg players.
2014-03-27 20:58:55 -07:00
YotaXP febfa4d1e5 Merge branch 'qdel-with-datums'
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/controllers/garbage.dm
	code/game/atoms.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/modules/mob/mob.dm
2014-03-27 21:46:53 -04:00