cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-20 07:12:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
29,527 Commits 26 Branches 2 Tags
288af9f92cb15d93b0956a8b32b2f47ebb0dfd93
Commit Graph

307 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
6a8ea815b2 Merge branch 'master' into buttbots2 
Conflicts:
	code/defines/procs/AStar.dm
	code/modules/mob/living/simple_animal/bot/cleanbot.dm
	code/modules/mob/living/simple_animal/bot/medbot.dm
	paradise.dme
 2016-03-31 13:33:46 -04:00
Tastyfish
25195208a9 Ports tg simple_animal bots 2016-03-28 00:22:04 -04:00
Aurorablade
8dd0aecac8 BUTCHER ALL THE THINGA 2016-03-25 20:08:06 -04:00
Aurorablade
4557d17730 fixed simple animal butchering.... 2016-03-24 23:44:10 -04:00
Aurorablade
40a1086f14 butchering is still broke.... 2016-03-24 00:07:41 -04:00
Aurorablade
db887489d3 tiggersgonnaeatme 2016-03-23 17:31:29 -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
296e689e7e Merge remote-tracking branch 'upstream/master' into tgcam 
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2016-03-14 14:45:21 -07: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
Crazylemon
1eba9a6df1 Skeletons and slime people should no longer bleed "blood" when hit 2016-03-10 17:03:25 -08:00
Fox McCloud
ab490f7fd9 Merge pull request #2903 from Aurorablade/OrganRefactor 
[HOLY SHIT!]Charlie, lets go to candy mountain, charlie
 2016-03-04 19:51:50 -05:00
Crazylemon
3d37285c2f Adds in returns, removes buildmode click speed limit on living mobs 2016-02-29 16:03:11 -08:00
Crazylemon64
a816e0e0aa Makes buildmode quit if you switch to another mob, to prevent tragedy 2016-02-29 08:09:47 -08:00
Crazylemon64
a8f890bad1 Updates the buildmode tool to allow for better area generator testing 2016-02-29 07:09:00 -08: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
5f98feb0bc meanwhile as i driver tiger INSANE 2016-02-25 16:17:39 -05:00
Aurorablade
9a804ebd31 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-24 06:27:16 -05:00
Aurorablade
bbac4006b5 fixc all the things. 2016-02-23 02:48:13 -05:00
Crazylemon64
7f47aea249 No more superspeed simple mob attacking 2016-02-19 04:55:11 -08:00
Aurorablade
570dd619b7 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-18 19:01:41 -05:00
Fox McCloud
fe78b45b41 Merge pull request #3578 from Tastyfish/pda-apps 
Complete refactor & partial redesign of the PDA
 2016-02-18 13:39:37 -05:00
Fox-McCloud
7b1905477d Tweaks Laser Eyes 2016-02-14 00:22:13 -05:00
Tastyfish
a8f9ea2086 pda refactor 2016-02-12 03:24:21 -05:00
Aurorablade
545d3abf19 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into OrganRefactor 2016-02-11 18:03:09 -05:00
Crazylemon64
b3c795f8fc Lets you follow any movable atom 2016-02-09 18:33:13 -08:00
Crazylemon64
88d90b1640 Ghosts can follow mechs 2016-02-07 13:42:42 -08:00
Aurorablade
e1899e4af9 almost 2016-02-06 18:42:26 -05:00
Aurorablade
12b3ccb2e2 why 2016-02-04 23:57:11 -05:00
Aurorablade
0fc841f0f9 can i sleep uyet 2016-02-03 00:40:10 -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
678a2e9f4e commit so i can go bugfix and do other things 
besides code in organs...tell me what i did wrong!
 2016-01-09 00:05:25 -05:00
Aurorablade
87d2023af3 so you can almost perform surgery with a claymore 
things needed: Addeing the sharp object used as a low success allowed
tool on the fly. Handleing advanced scalpals.
 2016-01-07 23:25:06 -05:00
Aurorablade
948adea83b Added Asses as an organ 
...made you look...
seriously though, refined some surgery datums/steps and commiting so i
can go bugfix some stuff...and a sidequest...i need to adjust return
values.
 2016-01-04 08:25:39 -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