a250e5f670
More !!FUN!!
...
Im open to discussion as to remove some of the TOO op mutations
2014-04-13 00:04:41 +04:00
b18cc7d54e
Merge branch 'master' of https://github.com/tgstation/-tg-station into manidontevenknowwhatwentwrongwiththat
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/objects/structures/door_assembly.dm
code/game/objects/structures/false_walls.dm
code/game/objects/structures/mineral_doors.dm
code/modules/research/protolathe.dm
icons/obj/doors/door_assembly.dmi
2014-04-11 02:51:07 +10:00
30bb6c8814
Generalised ID naming
2014-04-09 18:49:59 +02:00
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
c9bd6c3688
Merge pull request #3296 from Ikarrus/alarmdelay
...
Alarm Delay Reduction
2014-04-07 14:04:50 -05:00
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
e41dd607b5
Better comment.
2014-04-06 14:27:28 +01:00
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
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
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
f46cb302a4
Updated to work with newer cyborg code.
2014-04-02 22:12:36 -06:00
f705141fce
Resolved Conflicts:
...
code/datums/wires/robot.dm
2014-04-02 20:23:31 -06:00
1b10254a25
Reverts my and Incoming's April Fools
2014-04-02 20:03:17 +02:00
24e1e89afb
Merge pull request #3260 from Incoming5643/Realism
...
Minor fix to improve realism
2014-04-01 19:55:33 +02:00
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
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
f618fe556e
Merge pull request #3241 from Miauw62/aprilfools2014ian
...
April fools
2014-04-01 05:54:22 -07:00
79746e115f
Wooden Walls
2014-04-01 18:03:02 +11:00
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
6c1150dca3
Merge pull request #3143 from Malkevin/saccult
...
Sacrifice Cult
2014-04-01 02:18:39 -03:00
25fe463eb2
Ensures re-humaned cyborgs get normal macros.
2014-03-31 22:04:33 -07:00
222f769b0c
Merge pull request #3091 from Incoming5643/diehardwithaventgeance
...
Fixes #3084
2014-03-31 21:39:32 -05:00
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
0725ba44a4
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
2014-03-31 22:17:24 +01:00
335c4591ad
Just uses Login()
2014-03-31 13:30:19 -04:00
83176c5ee2
improves le corgis immensely xd
2014-03-30 20:06:06 +02:00
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
6cb3ae5183
Revert "Merge pull request #3142 from Alek2ander/master"
...
This reverts commit 6f9b58abceeda7110a23
2014-03-29 18:02:54 +04:00
6f9b58abce
Merge pull request #3142 from Alek2ander/master
...
pAI remote computer control
2014-03-29 06:18:22 -07:00
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
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
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
006a7e2d40
Removed pAI check in attack_hand
...
Added pAI check in the Security Camera Console instead.
All the others seem fine.
2014-03-27 19:16:16 +04:00
358ecf7e6a
Merge branch 'master' of https://github.com/tgstation/-tg-station into tgstation-master
...
Conflicts:
code/game/machinery/computer/computer.dm
code/game/machinery/computer/telecrystalconsoles.dm
2014-03-27 18:31:11 +04:00
cd6c1272ad
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
2014-03-27 13:18:46 +00:00
0b1ba613b6
Merge pull request #3177 from phil235/earmuffsfix
...
Fixing being able to hear with earmuffs on.
2014-03-27 06:52:43 -03:00
5257a2d3b5
-Made Ian sacrifice less of a "Hey fuck you die".
...
-Made it so that each of the three cultists in live sacrifice get a word, to reward team work
-Made hell water not as deadly
2014-03-26 19:26:28 +00:00
990ed20873
Merge branch 'master' of https://github.com/tgstation/-tg-station into saccult
...
Conflicts:
code/modules/mob/mob.dm
2014-03-26 18:38:07 +00:00
9701dd16ae
Only checking for earmuffs once.
2014-03-26 15:10:08 +01:00
667a773553
Make most mobs del() instead of trying to GC them.
...
Don't try to Destroy() objects that get del(). It was causing infinite loops and other problems. It's now ok to have something call del(src) as part of Destroy().
2014-03-25 08:44:40 -07:00
6b83a8d2e0
I am crying.
...
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue
Conflicts:
code/game/objects/structures/crates_lockers/closets/statue.dm
code/modules/mob/living/simple_animal/hostile/statue.dm
code/modules/projectiles/projectile/magic.dm
tgstation.dme
2014-03-24 22:13:43 -04:00
cc50291765
missed a parenthesis
2014-03-25 03:11:05 +01:00
3695a916ea
Fixing being able to hear with earmuffs on.
...
I hope I didn't make any mistake, this should prevent ear_deaf from flickering between 0 and 1 while wearing earmuffs.
2014-03-25 02:58:47 +01:00
9e9dc34ecf
Merge pull request #3163 from Mloc/tg-eol
...
proper crlf forcing
2014-03-24 22:47:13 -03:00
43a6e111c5
Merge pull request #3118 from VistaPOWA/cyborg_module_in_telecomms
...
Adds the Cyborg module into the messages received by the AI
2014-03-24 15:08:25 +00:00
8af8a43d6f
Initial pass to convert LF to CRLF
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
2014-03-24 08:53:40 +00:00
bab77f2538
Merge branch 'master' of https://github.com/tgstation/-tg-station into toostat4tue
...
Conflicts:
code/modules/projectiles/projectile/magic.dm
2014-03-23 12:08:33 -04:00
5035820e9c
fixes me being stupid and not setting creator right
...
Now for the conflicts...
2014-03-23 11:53:38 -04:00
5a3b654302
More sanity checks
...
pAI interface is weird, let's make sure we're always in a valid state
2014-03-23 13:49:10 +04:00
223e5f7478
Arcades, overlays and Git being evil
...
Added the most important damn checks of this entire PR that got eaten by
Git when I synced
Added a visual indication of a pAI being paired with a computer - a tiny
blue light at the bottom
Forbid to pair with computers that have non-standard icons, except the
arcade machine.
When the arcade is emagged, if the pAI loses, it will explode like a
detonated PDA. If it's slotted into a PDA, it will explode with it.
Severs connection if the pAI and the computer are on different z-levels
2014-03-23 12:39:13 +04:00
Razharas
Jordie0608
Daniel
Razharas
Cheridan
iamgoofball
Giacomand
Miauw62
ikarrus
Menshin
Incoming
Aranclanos
MrStonedOne
Malkevin
Alek2ander
phil235
MrPerson
fleure
Mloc-Hibernia