Commit Graph

307 Commits

Author SHA1 Message Date
Aurorablade
4947c41c8d INDENT ERROR GRAWWRRGHHHH 2015-12-11 00:30:00 -05:00
Aurorablade
323a7e84cc woops... 2015-12-10 22:31:50 -05:00
Fox McCloud
b8db2dd78d Merge pull request #2682 from Aurorablade/ScreenObjs
Screen object cleanup
2015-12-07 01:14:39 -05:00
Aurorablade
29eba99eeb FUCK YOU FUN CODE 2015-12-04 22:34:25 -05:00
TheDZD
3f72596e62 Merge pull request #2612 from Aurorablade/Guardingthings
Fethas Carnival of Horrors part 4: I am in your greytide guarding ur newbs
2015-12-02 21:21:22 -05:00
Aurorablade
e543062396 PAWNCYPAUNCH 2015-12-02 20:57:32 -05:00
Aurorablade
42f912e238 Conflict fixes 2015-12-02 00:54:10 -05:00
Aurorablade
0e485cd893 conflicts 2015-12-02 00:21:20 -05:00
Tastyfish
280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Tastyfish
1627c6b124 made AI tracking cancel-able, fixed folder labelling 2015-11-30 01:06:21 -05:00
Aurorablade
a451932e74 Fized intents, gun toggle is odd... 2015-11-30 00:17:38 -05:00
Aurorablade
58195b8e85 Screen object cleanup 2015-11-29 07:04:21 -05:00
Aurorablade
2c5a210ad8 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into Guardingthings 2015-11-24 21:08:43 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Aurorablade
5986006578 guarding yo things 2015-11-20 08:11:22 -05:00
Tigercat2000
29f42f8b61 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/silicon/pai/life.dm
2015-11-07 20:54:24 -08:00
TheDZD
4556e60030 Merge pull request #2473 from Fox-McCloud/blood
Bloody Mess Fix
2015-11-05 17:45:02 -05:00
Fox-McCloud
9e095bf360 Bloody Mess Fix 2015-11-05 08:01:26 -05:00
TheDZD
0604c8d16e Merge pull request #2325 from Aurorablade/ForTheSwarm2
Fethas Carnival of Horrors part 1.5: Swarmers
2015-11-03 19:20:08 -05:00
Tigercat2000
633a9e68b4 Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	 ^ This shit is haunted. It's conflicted on two branches for 0
	 reason, the automatic merge wouldn't work on the fucking end of
	 file.
2015-10-19 16:13:51 -07:00
Aurorablade
c520586953 changes
added new posible skeleton outfits
Chaplain traitor voodoo doll, Tell me if the TC cost needs adjusting.
On Click fix...
2015-10-14 20:39:29 -04:00
Aurorablade
2b54e5cf63 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' into ForTheSwarm2 2015-10-11 22:50:27 -04:00
Fox McCloud
8134abf488 Merge pull request #2339 from tigercat2000/pullfactor
-tg- pull refactor
2015-10-11 15:46:36 -04:00
Fox McCloud
13638cc6a6 Merge pull request #2330 from Robertha89/master
Science Goggle Analysers
2015-10-10 18:23:36 -04:00
Tigercat2000
ccdae149bb -tg- pull refactor
This commit does the following:
 - Overhauls how pull works. It is now based on a mob verb,
   mob/verb/pulled()
 - Makes the pull icon much more responsive. It is now updated whenever a
   mob starts or stops pulling an object, and instantly updates.
   - This required HUD changes. God help me.
2015-10-10 11:15:52 -07:00
Robertha89
836ddb15d4 Science analyser goggles 2015-10-09 08:22:45 +02:00
Aurorablade
769a5d3bff FUUUUUUUUUUUUUUUUUUUUUUUUUUUU
Merge conflict EXTREAME FIX
2015-10-08 18:38:45 -04:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Tigercat2000
545c38a79b Merge remote-tracking branch 'upstream/master' into third_times_the_charm_questionmark
Conflicts:
	code/game/objects/items.dm
2015-10-08 11:16:30 -07:00
Fox-McCloud
b312ff41db More Destroying Tweaks 2015-10-06 23:29:51 -04:00
Tigercat2000
4fc91429e5 Baystation Rigsuits
This commit adds baystation's rigsuit system on top of our own hardsuits;
Our own hardsuits still function fine and are around, but these are
available to admins. Next commit will contain balancing and player
implementation stuff.
2015-10-05 16:42:00 -07:00
Tigercat2000
8c97846746 -tg- style inventory update, stripping update
This commit does the following:
 - Updates a few of our inventory procs to -tg-'s latest
 - Nukes the equip_e system from orbit
 - Fancy UI for stripping people now
 - Nuked fucking kitten ears from their snowflakey bullshit update_icons
   shitty fuck fuck FUCK
 - NUKED FUCKING METAL DETECTORS AHHHHHHHHHHHHHHHHHHHHHHHHHH
2015-10-04 16:53:48 -07:00
Markolie
9ec1f3987c Make darkness clickable 2015-10-01 01:35:59 +02:00
Tigercat2000
4f3938d68b -tg- buckling system
This commit overhauls a bunch of systems so that buckling works for
any subtype of /obj. This means that space vines and chairs and beds all
use the same system. A lot of stuff has been touched.
2015-09-24 15:52:10 -07:00
TheDZD
7e9b2f99b1 Merge pull request #2091 from Fox-McCloud/destroy-them-all
Fixes up a few Destroys
2015-09-18 22:30:49 -04:00
TheDZD
b27753e163 Merge pull request #2088 from Fox-McCloud/point-rework
Point Rework
2015-09-18 22:30:22 -04:00
Fox-McCloud
56ed8c1a7e Pass III 2015-09-18 21:15:08 -04:00
Markolie
2e064a1050 Fix Wizard infinite spell exploit 2015-09-18 05:03:17 +02:00
Fox-McCloud
480613208d Point Rework 2015-09-17 22:26:03 -04:00
Tigercat2000
0603f73232 Bay12 examine overhaul.
This commit overhauls the examine system to baystation's latest system,
including a more efficient verb approach, and a new status panel tab,
which shows more information for pre-defined objects.
2015-09-14 11:51:40 -07:00
Tigercat2000
be92665871 Replace magic intent words with defines, grab fixes
This commit does the following:
 - Replaces all instances of magic intent words, like "harm" and
 "help" with defines, I_HELP, I_DISARM, I_GRAB, I_HARM

 - Fixes a few manual grab instances left over in attack_alien, they
 will now used grabbedby()
2015-09-07 11:51:00 -07:00
Markolie
5dc034719d Port Bay's silicon law manager 2015-08-31 02:18:49 +02:00
Markolie
6716c21a8f Update ghost following 2015-08-23 20:01:53 +02:00
Markolie
8086d61042 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into malf
Conflicts:
	code/game/objects/items/devices/aicard.dm
2015-08-18 20:24:10 +02:00
Markolie
80360fd8a9 Malf AI update 2015-08-18 20:22:38 +02:00
Krausus
2090a66023 Fixes various runtimes
- Fixes flashers runtiming when flashing someone who lacks eyes.
- Fixes chem masters runtiming when told to make 0 pills.
- Fixes job objective completion runtiming when someone without a PDA
completes a job objective.
- Fixes the HUDs of clientless robots runtiming when trying to update.
- Fixes T-ray scanners causing runtimes when objects they're making
visible get deleted.
- Fixes mech bay recharge station turfs runtiming if destroyed while
missing a recharging port/console.
2015-08-18 02:53:23 -04:00
Fox-McCloud
aa9cf52467 Changes View Range to Default of 15x15 2015-08-12 18:01:24 -04:00
Markolie
73e94b5dc4 Alarm system overhaul 2015-08-02 07:13:03 +02:00
Markolie
c2cbaa7627 Add borg headlamp, add movement states for surgeon/miner bot, add jetpack overlay to all miner borgs 2015-07-30 19:33:49 +02:00
SamCroswell
73bf040ba4 Middle Click Override 2015-07-16 21:51:20 -04:00