cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-25 17:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
27,988 Commits 29 Branches 2 Tags
ffb0201a25c0bdc5439a19ec0cc4095556b19710
Commit Graph

1757 Commits

Author SHA1 Message Date
Aurorablade
ffb0201a25 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into BookClub 2016-05-21 21:59:29 -04:00
Aurorablade
05346d1480 incoming shitode... 2016-05-20 00:48:09 -04:00
Fox McCloud
3ee2e470a1 Merge pull request #4331 from KasparoVy/voxhair 
Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Fixes/Refactors Morph + Features to Morph and CMA...
 2016-05-13 15:36:34 -04:00
Fox McCloud
825e597510 Merge pull request #4408 from CrAzYPiLoT-SS13/pAIze 
Adds pAIzing
 2016-05-13 15:17:07 -04:00
Aurorablade
a44086c39a FALSE HALP 2016-05-13 00:48:54 -04:00
Aurorablade
f99a8141c5 TG Ports and datum cult screwups 2 
I may have missed something
 2016-05-11 20:15:36 -04:00
KasparoVy
13003fe351 Merge branch 'temp2' into temp 2016-05-10 00:10:15 -04:00
Matt
10780aa200 Adds pAIzing 2016-05-10 00:02:55 +02:00
Tastyfish
604abcf9fc Fixes Create Antagonist panel's vampire thing 2016-05-08 22:15:27 -04:00
Aurorablade
c96da9b34b Kills mask of Narsie 2016-05-07 23:41:16 -04:00
FalseIncarnate
a68ddb1116 Global Intercom list, minor code cleanup round 2 2016-05-06 03:20:00 -04:00
KasparoVy
f95655419c Refactors Hair so it's on the Head + Adds a Vox Hairstyle + Adjusts Vox Hairstyle Names for Consistency -- PASS 1 
Also fixes a typo or two.

TO DO: FULLY TEST AND SWEEP FOR BUGS, ERRORS AND RUNTIMES
 2016-04-30 08:12:41 -04:00
Tastyfish
5268804db0 Fixes Check Antagonists Panel 2016-04-28 22:23:42 -04:00
TheDZD
23174def7a Merge pull request #4283 from Tastyfish/checkout-my-moves 
Makes admin jump commands use forceMove(), improves forceMove
 2016-04-26 19:13:09 -04:00
Tastyfish
a9582d9247 Improves admin jump commands, forceMove 2016-04-26 18:53:17 -04:00
TheDZD
cdc20258a1 Merge pull request #4212 from Tastyfish/bans 
Cleans up special role jobbans
 2016-04-25 18:34:37 -04:00
Tigercat2000
57648bd6b7 Fix multiple instances of to_chat not being used 2016-04-23 20:45:37 -07:00
Fox-McCloud
3dd9a6d744 Updates Revolution 2016-04-21 06:36:35 -04:00
Fox-McCloud
76cd925d75 last fixes 2016-04-19 01:34:54 -04:00
Fox-McCloud
87a9f30bd4 Part 6 2016-04-18 05:32:41 -04:00
Fox-McCloud
fe170db7bb part 3 2016-04-17 10:35:10 -04:00
Tastyfish
127787aec5 Cleans up special role jobbans 2016-04-15 16:18:49 -04:00
Fox McCloud
83c3640b29 Merge pull request #4157 from Tastyfish/books-book-everywhere 
Ports /vg/'s library computers
 2016-04-14 23:01:33 -04:00
Fox McCloud
90a8ca108f Merge pull request #4036 from monster860/adminbus 
Adds area editing, linking, and filling to buildmode
 2016-04-14 19:07:49 -04:00
monster860
198bcd384d travis 2016-04-12 17:53:54 -04:00
monster860
c769b14158 lien nutes 2016-04-12 17:44:44 -04:00
Fox McCloud
1097f66ecb Merge pull request #4165 from Tastyfish/sdql-update 
More SDQL Insanity
 2016-04-12 03:27:11 -04:00
Fox McCloud
1d04645730 Merge pull request #4145 from Tastyfish/snpcs 
Ports SNPCs
 2016-04-11 20:44:50 -04:00
Tastyfish
a298ca044a Fixes function call with lists 2016-04-11 16:29:20 -04:00
Tastyfish
59097a99ea Allows update to set to vars of vars, call procs in arbitrary expressions, 
procs of vars
 2016-04-11 03:00:21 -04:00
Tastyfish
65432404fa Ports vg's library machinery, also flagging books 2016-04-10 23:13:14 -04:00
Tastyfish
a0ad6582a1 Updates maploader code to be in line with tg's, startup improvements 2016-04-10 02:57:58 -04:00
Tastyfish
7d259d35c7 Ports SNPCs 2016-04-09 00:10:01 -04:00
monster860
a7465f03a9 Merge branch 'master' into adminbus 2016-04-07 21:15:59 -04:00
Tigercat2000
bb5e3bca63 Fix remaining issues and sound shit 2016-04-05 16:26:11 -07: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
monster860
d379822c9c Adds link mode 2016-04-02 21:40:49 -04: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
monster860
bac5ffa829 Fill mode 2016-03-30 13:52:11 -04:00
monster860
8ec3dc388a Makes it not stay 2016-03-29 17:02:11 -04:00
monster860
5b3512039d Adds areaediting mode. 2016-03-29 16:57:57 -04:00
Tigercat2000
ad2cf86898 -tg- disease1 
Wee! Readds Disease1, kills off disease2, and finally removes poop.dmi
(fucking piece of shit)

Needs WAY more testing, most of which I don't know how to do yet, because
I've never used this system. Fun!

Changes:
 - Virus2 has been removed completely.
  - Some symptoms have not been readded. Aka, none of them have been
    readded, I just wanted to get this shit ported.
  - Virology has been updated slightly to mirror -tg-'s boxstation, as the
    virus2 machines are gone.
 - Welcome back, disease1
  - The centrifuge, vials, splicer, analyzer, growerthing, have all been
    replaced by the PanD.E.M.I.C. 2220
  - No symptoms have been completely removed; However, vision symptoms
    have been disabled pending byond 510, and genetics symptoms have been
    disabled until "when I figure out how to fix them".
  - Advanced Mutation Toxin now uses a disease, which turns people from
    species, to slime person, to slime. Slime people are instantly turned
    to a slime.
  - Diseased touch now give people appendicitis. Yes, they VANT YOUR...
    appendix.
  - Virology now has a fridge with the following in it:
    - Antiviral Syringes
    - 1 Rhinovirus culture
    - 1 Flu culture
    - 1 Bottle of Mutagen
    - 1 Bottle of Plasma
    - 1 Bottle of Synaptizine
  - A few more things, which I can't remember and can't look at while writing
    this commit. Sometimes, git hurts.

TODO:
 - Test more shit and figure out how the PanD.E.M.I.C. works/is supposed to
   work.
 - Fix genetics symptoms.
 - Give vampires a less shitty diseased touch.
 - Add appendicitis event.
 -
 2016-03-27 21:24:00 -07:00
Fox McCloud
558d3a82a2 Merge pull request #3967 from Crazylemon64/shoulda_added_notifications 
Adds notification to admin ghost incarnation
 2016-03-24 13:06:07 -04:00
Tastyfish
cd06bf07e0 Ports more sdql features from vg 2016-03-23 05:59:17 -04:00
Crazylemon64
8bd972c9af Adds notification to admin ghost incarnation 2016-03-22 21:55:54 -07:00
Fox McCloud
d616a862b3 Merge pull request #3941 from Tastyfish/sdqlcall 
Adds src and usr to SDQL
 2016-03-21 21:05:54 -04:00
Tastyfish
a18cb8c21f Adds marked, [0x] refs, and hex numbers to SDQL 2016-03-20 22:13:57 -04:00
TheDZD
854420bc74 Merge pull request #3911 from KasparoVy/ipc-fbp-resolved 
IPC-FBP Customization
 2016-03-20 18:43:51 -04:00
Tastyfish
1c3a8b5263 Adds src and usr to SDQL 2016-03-20 17:20:12 -04:00