Commit Graph

16446 Commits

Author SHA1 Message Date
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
Zuhayr
202398d0e2 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-07-31 23:08:14 +09:30
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
afc40e7f44 Fixes #5202 2014-07-31 20:46:52 +09:30
Zuhayr
a3778f5a5d Fixes #5774 2014-07-31 20:14:25 +09:30
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
7416d26197 robot computer emagging exploit fix
so an emagged borg can in turn emag all others ?
the more you know.
seems extremely OP to me but i am just closing the exploit, not changing the game.
2014-07-31 10:38:34 +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
Walter0o
06ca10df6b computer3 ntos topic exploit prevention 2014-07-31 09:48:17 +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
0aadca2fab computer3 program topic protection 2014-07-31 09:42:26 +02:00
Walter0o
a8baa2c855 computer3 remote view exploit fix
you could look at any atom for a tick.
could need improvement, does not check camera network at the moment,
because of the costly and temporary nature of the getter proc.
2014-07-31 09:34:58 +02:00
Walter0o
61a1904e78 prisoner computer3 topic exploit fixes
fun : you could trigger grenades this way
2014-07-31 09:28:47 +02: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
Rob Nelson
68a13a6d60 Vending machine href exploit fix
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/vending.dm
2014-07-30 21:47:29 +01: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
Chinsky
e69e6d8946 Merge pull request #5822 from mwerezak/sounds
Sound fixes
2014-07-30 21:12:34 +04:00
Chinsky
9c2baaa479 Merge pull request #5831 from PsiOmegaDelta/Pics
Synth camera
2014-07-30 21:11:14 +04: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
Zuhayr
3105297f3e Adjusted spawn procs for heist and nuke. 2014-07-30 21:08:28 +09:30
Zuhayr
fcd1c73b17 Adjusted gas exude code. 2014-07-30 20:54:36 +09:30
Atlantiscze
da6190aa25 Fixes #5827
- Drones can now use .d to access Drone chat
- Cleaner and nicer check for dronechat, uses proper data from say.dm shortcut list.
- MISSING: .d alternative for "Russian localization" (Does anyone actually use that?)
2014-07-30 12:15:15 +02:00
PsiOmega
b9537adfef Adds proximity check to prevent telekinetic taping of doors. 2014-07-30 10:22:50 +02:00
JimTheCactus
47dbc9c374 Merge branch 'dna_field_fix' into computer3_text_field_fix
Conflicts:
	code/WorkInProgress/computer3/computers/medical.dm
2014-07-30 01:29:17 -06:00
JimTheCactus
e02ccd5564 Ported blank field patch to Computer3 systems 2014-07-30 01:25:15 -06:00
JimTheCactus
19b032d8e8 Fixed bad reference to active 1 in the medical computer's DNA field inputs. 2014-07-30 01:09:26 -06:00
JimTheCactus
4d920bef59 Corrected variable edited field for blood dna. Was dna, not b_dna like it should be. 2014-07-29 23:19:29 -06:00
Zuhayr
e2e039f72a Adjusted process_reagents() so hydro trays are refillable with water and nurients when the tray is dead/empty. 2014-07-30 12:39:28 +09:30
Zuhayr
ca59536e06 Reapplying some fixes that I think DM may have saved over, whoops. 2014-07-30 12:34:36 +09:30
Zuhayr
251b44a53c Changed hydro trays, fertilizer and syringes over to use the reagent procs. 2014-07-30 12:24:03 +09:30
Jarcolr
bd4d07c18a Adds 2 approved custom items to code
http://baystation12.net/forums/viewtopic.php?f=33&t=10949
http://baystation12.net/forums/viewtopic.php?f=33&t=10894
2014-07-29 22:08:32 +03:00
Jarcolr
5b77883f36 Adds 2 approved custom items and update
http://baystation12.net/forums/viewtopic.php?f=33&t=10952 for update
http://baystation12.net/forums/viewtopic.php?f=33&t=10850 for
Cataguette's item
http://baystation12.net/forums/viewtopic.php?f=33&t=10527 for Yankee's
item
2014-07-29 21:04:41 +03:00
PsiOmega
3ad8f4ca24 Merge branch 'dev' into Pics
Conflicts:
	code/modules/paperwork/photography.dm
2014-07-29 16:45:55 +02:00