Commit Graph

121 Commits

Author SHA1 Message Date
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
Tigercat2000
78f53553f8 Reduce lines by removing blank lines added by PJ's script 2016-04-05 08:25:57 -07:00
Tigercat2000
9d430844c3 Replace most (if not all) output << operators with to_chat(user, message)
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.

Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
2016-04-05 08:15:05 -07:00
Tigercat2000
7a41efd1da Last staging fixes 2016-04-01 16:09:43 -07:00
Tigercat2000
519992b5a9 Merge branch 'byond510'
Conflicts:
	.travis.yml
	code/game/jobs/access.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/flasher.dm
	code/game/machinery/vending.dm
	code/game/objects/items/devices/laserpointer.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/tools.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/carbon/human/species/species.dm
	code/modules/mob/living/life.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/bees.dm
	code/modules/nano/modules/virus2_creator.dm
	code/modules/virus2/disease2.dm
	code/modules/virus2/diseasesplicer.dm
	paradise.dme
2016-04-01 14:15:44 -07:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Fox McCloud
0e521388d8 Merge pull request #3936 from Tastyfish/captain-ian
Improves pet collars
2016-03-21 21:05:42 -04:00
Fox McCloud
3bde57e65c Merge pull request #3905 from Aurorablade/GuardianUpdate
Antagus Minor:Spritus
2016-03-20 18:40:26 -04:00
Tastyfish
e98484e103 allows collars to be used as id for doors 2016-03-20 09:34:36 -04:00
Aurorablade
5896ebc1ca bwoink 2016-03-16 03:53:38 -04:00
Tigercat2000
bc78146178 Port -tg-station cameranets
This should make it much easier to port abductors, if we ever want to do
that.

Changes:
  - Fixed a bug where the AI could not delete photos it takes.
  - Ported -tg- cameranets. This means that all of our camera based systems are more or less up to date with -tg-; 510 features are missing.
  - An AI with the 'camera lights' mode on will now, instead of the button toggling the closest camera's light, toggle camera lights on/off as the AI moves.
  - It now takes a minimum of 30 deciseconds between attempting to track someone, and locking on. This number is increased by their distance away from the AI eye.
  - The camera activate/deactivate proc is now called 'toggle_cam'.
  - The 'trackable' proc has been replaced by a more object-oriented 'mob.can_track()' proc.
  - The 'networks' section of the security camera console is now above the camera list.

In laymans terms: This refactors how security cameras calculate what
viewers can see, and adds a few neat features on top.
2016-03-13 15:06:24 -07:00
Tigercat2000
0c9a469f2c 510: HUD, Flash Refactor, Rip out unused pain system 2016-02-28 18:09:43 -08:00
Tigercat2000
976887b2e0 Replace text2list and list2text 2016-02-28 12:07:19 -08:00
Aurorablade
bbac4006b5 fixc all the things. 2016-02-23 02:48:13 -05:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Tastyfish
a8f9ea2086 pda refactor 2016-02-12 03:24:21 -05:00
Aurorablade
25876fd036 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-02 15:35:54 -05:00
SakuraTheBabyfur
30833c968c Fixes AI not being able to call the shuttle 2016-01-29 19:03:19 -05:00
Aurorablade
b2881bdc94 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-26 21:17:25 -05:00
Aurorablade
95dca71432 Merge branch 'OrganRefactor' of https://github.com/Aurorablade/Paradise; branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-01-21 21:11:26 -05:00
Fox-McCloud
c184985a3d Merge remote-tracking branch 'upstream/master' into ling-hud 2016-01-21 18:22:52 -05:00
Fox-McCloud
fb11acbf79 Implements Ling HUD 2016-01-20 22:38:26 -05:00
Fox-McCloud
a644600ab8 Removes Vampire HUD 2016-01-20 17:45:43 -05:00
Aurorablade
4b7253befc commit so i can swap branches...
please note, anything further on changling may invovle updates to game
mode, so another pr. and yes with the brains its jut blocked from
prepare_eat() proc
2015-12-21 23:19:27 -05:00
Aurorablade
80eb828563 this shit dosen't even compile yet... 2015-12-19 22:39:47 -05:00
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
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
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
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
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