Mloc
457d76f441
Merge pull request #5834 from Zuhayr/hydroponics
...
Changes dev hydro to use reagent procs.
2014-08-01 15:01:52 +01:00
Zuhayr
9eefdf4db8
A bit of prep work for integegrating player-set backgrounds into gameplay.
2014-08-01 22:54:57 +09:30
Zuhayr
e298b177db
Added flags for Mining and Xenoarch.
2014-08-01 22:40:48 +09:30
Zuhayr
1bd8b7baf0
Added citizenship, faction, religion and home system to character generation.
2014-08-01 22:05:38 +09:30
Zuhayr
a6e483d48d
Merge pull request #5856 from PsiOmegaDelta/SuperMatter
...
Fixes #5844
2014-08-01 22:00:19 +09:30
Zuhayr
9c1e14eb67
Merge pull request #5855 from PsiOmegaDelta/PurpleComb
...
Fixes #5839
2014-08-01 21:59:41 +09:30
Zuhayr
2493dedf4b
Merge pull request #5847 from MrSnapwalk/psychotailor
...
Psychiatrist/Psychologist update
2014-08-01 21:59:10 +09:30
Zuhayr
21b02f3019
Merge pull request #5846 from Walter0o/href_fun
...
exploit-fix-o-rama
2014-08-01 21:59:00 +09:30
Zuhayr
128ad5a817
Merge pull request #5843 from mwerezak/taj-suits
...
Updates tajaran hardsuit sprites
2014-08-01 21:58:11 +09:30
Zuhayr
dfb662fa4a
Merge pull request #5841 from mwerezak/escape-pods
...
Fixes emergency shuttle UI and tweaks escape pods
2014-08-01 21:58:02 +09:30
Zuhayr
1376a827d6
Merge pull request #5833 from Jarcolr/customs
...
Adds *6* approved custom items and updates a custom item
2014-08-01 21:57:33 +09:30
PsiOmega
8104928e75
Creates a shared proc for applying AI verbs. DRY. Arranges some consistency among verbs.
...
Fixes #5867 as well as a couple other missing verbs.
2014-08-01 10:36:44 +02:00
PsiOmega
c416205c7d
Moves robot/drone specific New()-code into their respective classes, handling it using proc-overloads.
...
Also re-arranges robot init() code to prevent a runtime error when attempting to synch photos with the Master AI.
2014-08-01 09:17:26 +02:00
mwerezak
63aab94d3c
Cleans up weapon embedding code
...
Removed weapon embedding from human/apply_damage(), as it didn't really
belong there. As well, used_weapon is intended mainly for autopsy info,
so it didn't seem appropriate to use it to embed things.
2014-07-31 19:43:36 -04:00
mwerezak
768019b918
Stunbaton fixes and cleanup
...
Apparently harm intent is "hurt", not "harm"
2014-07-31 19:17:05 -04:00
mwerezak
71e54111ab
Handcuffs now require an aggressive grab
2014-07-31 18:10:11 -04:00
mwerezak
8bd7a11ff4
Fixes siemens coefficient not blocking stun disarm
2014-07-31 17:19:35 -04:00
mwerezak
697979c2f6
Makes humans scream if taking enough halloss
2014-07-31 17:06:42 -04:00
mwerezak
5b90e4afc6
Allows the use of stun weapons to show up in autopsies
2014-07-31 17:01:06 -04:00
mwerezak
ecd7df9628
Adds disarm effect for stun weapons and hands
2014-07-31 16:52:50 -04:00
mwerezak
56ccd4303b
Merges taser and stun baton effects
...
Makes the code for handling stun weapon effects much cleaner.
Moves electrocute_act and emp_act from living.dm into living_defense.dm
2014-07-31 16:21:22 -04:00
mwerezak
c8cccb64f6
Adds siemens_coefficient handling to stun batons
2014-07-31 15:38:56 -04:00
mwerezak
b529d582e5
Fixes siemens_coefficent not affecting shock damage
...
Also cleans up electrocute_act()
2014-07-31 15:20:45 -04:00
mwerezak
9bfb4642a2
Merge remote-tracking branch 'upstream/dev' into stun-baton
...
Conflicts:
code/game/objects/items/weapons/stunbaton.dm
Made all obj/item/weapons have "swing_hit" as their default hitsound.
Made hitsound not play when the attack misses.
2014-07-31 14:31:21 -04:00
mwerezak
a644156bdf
Taser cleanup and fixes
...
Fixes cloaking devices and deadman switches being included in taser code
somehow.
2014-07-31 13:40:23 -04:00
mwerezak
7130fd124b
Stun baton nerf
...
Adds agonyforce var to stun batons, which causes halloss and eye blur.
Also did some clean up of stun batons, and fixed the stun baton's bcell
var being of type weapon/cell/high instead of weapon/cell.
2014-07-31 13:39:06 -04:00
PsiOmega
da4dd93e75
Is a little convoluted but this removes the last X: use in supermatter.dm
2014-07-31 14:24:39 +02:00
Zuhayr
1cecd96e66
Fixes #5630
2014-07-31 19:46:21 +09:30
PsiOmega
ba247ffa40
Recasts objects to avoid usage of :
2014-07-31 12:14:39 +02:00
Walter0o
cfdb3288e7
derping derps
...
thanks to @mwerezak
2014-07-31 12:12:30 +02:00
Zuhayr
e7f31e1655
Fixes #5737
2014-07-31 19:40:09 +09:30
PsiOmega
d8df59a244
Fixes #5844 by only having a supermatter explosion affect living entities on the same Z-level.
2014-07-31 11:44:20 +02:00
PsiOmega
a093bee190
Fixes #5839 by making the comb slightly more gender aware.
2014-07-31 11:43:22 +02:00
Walter0o
eeb02dcfde
derp
2014-07-31 10:43:51 +02:00
Walter0o
ca78cb238a
cyborg topic exploit fixes
...
all kinds of fun here
2014-07-31 10:20:24 +02:00
Walter0o
f0042741fc
filing cabinet exploit fix
...
hooray for teleporting atoms to you via magic office furniture
2014-07-31 10:03:22 +02:00
Jarcolr
1e90a5b218
Adds Raptor1628's hazard hardsuit
...
http://baystation12.net/forums/viewtopic.php?f=33&t=10888
2014-07-31 10:44:34 +03:00
Walter0o
f9de5e3866
refining the clipboard topic checks
2014-07-31 08:57:56 +02:00
Walter0o
596ae37794
paper exploit fixes
...
i think my favourite part of this was
```var/obj/item/i = usr.get_active_hand()
if( ... && usr.get_active_hand() != i))```
2014-07-31 05:01:31 +02:00
Walter0o
67e58effd2
folder exploit fixes
2014-07-31 04:08:34 +02:00
Walter0o
404a89aed6
clipboard exploit fixes
2014-07-31 04:01:14 +02:00
MrSnapwalk
84ceb30d27
Psychiatrist/Psychologist update.
2014-07-30 20:57:20 -05:00
mwerezak
8e5f62a9da
Updates tajaran hardsuit sprites
...
Adds inventory sprites for all hardsuits that didn't have it before,
except for the wizard one.
2014-07-30 17:02:02 -04:00
mwerezak
55279f2fc0
Allows pod to be launched if shuttle leaves early
2014-07-30 15:45:21 -04:00
mwerezak
17574b8b20
Allows escape shuttle to scan IDs from within UI
...
Fixes #5592
2014-07-30 15:13:53 -04:00
Jarcolr
e1267b7fdf
Adds Supercotton's welding mask
...
http://baystation12.net/forums/viewtopic.php?f=33&t=10768
2014-07-30 21:20:33 +03:00
Zuhayr
70fe00e1c1
Updated borer icons slightly.
2014-07-30 21:51:17 +09:30
Zuhayr
f2393d9465
Replaces antag intro text and objective announcement with a proc.
2014-07-30 21:36:31 +09:30
Zuhayr
e885fc8115
Added Calamity mode.
2014-07-30 21:09:25 +09:30
Zuhayr
dac4e3432e
Adjusted borer spawns/options/vars.
2014-07-30 21:08:54 +09:30
