cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-19 22:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,274 Commits 27 Branches 2 Tags
c09fcb6e14d95cc4b2c2c00a42e7c3d73ccf4b4b
Commit Graph

323 Commits

Author SHA1 Message Date
Fox-McCloud
ebdd9d3897 Timestop Spell Port and Sepia Slimes 2016-01-06 03:30:08 -05:00
Fox-McCloud
38149bfc7d Merge remote-tracking branch 'upstream/master' into sec-rifle 2016-01-03 22:35:28 -05:00
Fox-McCloud
7830cd215b shotgun 2016-01-03 04:03:48 -05:00
KasparoVy
eb47c80d75 Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master' 2015-12-30 18:16:17 -05:00
Crazylemon
23e8b1277f Wave 2 of tweaks, probably needs a little more 
Ripped out the preferences_savefile.dm because it's obsolete and we
don't use it
 2015-12-27 06:32:25 -08:00
KasparoVy
5f72fff880 Final Pass 
Breaks Facial Hair updates into their own proc and puts facial hair on
its own layer.
Works through everything that calls update_hair with the intention of
updating facial hair and adds update_fhair
Fixes the sprite names and colouring on all 'facial' and 'body marking'
aspects.

Fixes/implements proper ID photo/preferences preview picture generation.

To do: Tail marking customization possible rework, gutting in the
meantime
 2015-12-27 05:45:25 -05:00
Aurorablade
ccd6d2641b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into HudRefactor 2015-12-17 22:43:09 -05:00
Aurorablade
c590958f2d Hud refactor 2015-12-10 01:01:54 -05:00
Tigercat2000
356835aa99 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 
Conflicts:
	code/game/gamemodes/heist/heist.dm
	code/game/gamemodes/malfunction/malfunction.dm
	code/game/gamemodes/revolution/revolution.dm
	code/modules/admin/verbs/randomverbs.dm
 2015-12-03 11:03:01 -08:00
Tigercat2000
e60799474b tgshuttles unfinished 2015-12-03 10:59:06 -08:00
Aurorablade
128ce44ff6 Added Wizard item 2015-11-25 17:01:55 -05:00
Tastyfish
85d651b781 refactored datum/effect/system because it was a complete mess 2015-11-22 19:43:01 -05:00
Tigercat2000
b36a32b6b8 Gamemode cleanup x1 
Changelog:
 - Enemy intercept (send_intercept()) completely nuked, it did not compile
   when I attempted to make it into a config option.
  - The intercept for blob() is retained and made into a custom proc for
    blob.
 - The constant variables 'waittime_l' and 'waittime_h' have been moved to
   /datum/game_mode, as they were defined on every gamemode with the same
   values.
 - rp-revolution.dm and anti_revolution.dm deleted. They do not compile,
   and are not included in the DME already.
 2015-11-16 11:51:18 -08:00
Aurorablade
e08d11ee2f forgot to give pirates the shield... 2015-11-02 15:09:26 -05:00
Aurorablade
17d50207ff Spooky Scary Skeletons 2015-11-01 23:40:47 -05:00
Aurorablade
4227cba055 Changes yay 
range change and skeleton change.
 2015-11-01 22:55:37 -05:00
Aurorablade
775c4051bc uncomments something commented for debuf 2015-10-24 22:40:52 -04:00
Aurorablade
4549035505 Reasons to NOT give me ideas.... 2015-10-24 01:59:49 -04:00
Aurorablade
99df52b229 HISSSSSSSSSSSSSSSSSSSSSSSS 2015-10-24 00:36:36 -04:00
Aurorablade
2c3e572602 We hats merge conflicts... 2015-10-24 00:32:56 -04:00
Aurorablade
6ce58424a8 small change 
the client connected bit is for debugging, will uncomment later.
 2015-10-22 20:29:34 -04:00
Aurorablade
a77885be69 wizard-chan Nyaa~! 2015-10-14 23:59:16 -04: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
6ed5a051e4 DON"T DROP ALL THE GORE! 2015-10-13 21:53:34 -04:00
Aurorablade
298d55f905 Voodooyay 2015-10-11 22:40:13 -04:00
Markolie
14f64b2b24 Fixes for Vox/Plasmamen highlanders/dodgeball players 2015-09-23 21:17:40 +02:00
Markolie
b4a4f29f3f Vox/Plasmaman spawn/wizard update 2015-09-23 08:14:12 +02:00
Markolie
2e064a1050 Fix Wizard infinite spell exploit 2015-09-18 05:03:17 +02:00
Markolie
90f722d752 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into intercom 
Conflicts:
	code/modules/projectiles/guns/projectile/automatic.dm
	icons/mob/back.dmi
 2015-09-15 04:18:27 +02:00
Markolie
f41f0a59fe Guns update 2015-09-14 04:05:20 +02:00
Markolie
ca6c7d10ba In hand sprite overhaul 2015-09-13 22:44:18 +02:00
Markolie
fb8758a83d Prevent jobbanned people from becoming constructs 2015-08-29 18:56:36 +02:00
Markolie
0a70d22ad3 Fixes mechas not gc'ing properly 2015-08-28 19:43:24 +02:00
DZD
0965789925 Fix merge conflicts 2015-08-21 18:38:42 -04:00
DZD
f3970fb304 Wizard touch attacks and fixes 
- Flesh to Stone and Disintegrate are now actual touch attacks.
- Fixes issue with in-hands and back sprites missing for the staff of
animation.
- Fixes missing right-handed in-hand for the staff of healing.
 2015-08-20 10:21:45 -04:00
Fox-McCloud
1f7bfe92be Merge pull request #1781 from Markolie/adminbus 
Admin teleport update, further admin message fixes
 2015-08-18 20:19:55 -04:00
Markolie
4e8bb6d301 Admin teleport update, further admin message fixes 2015-08-18 00:54:25 +02:00
Alex6511
ddaea2f664 Update wizard.dm 2015-08-15 04:05:51 -04:00
Alex6511
8d131e664e Update wizard.dm 2015-08-15 04:04:02 -04:00
Alex6511
780cc34d6e Update wizard.dm 2015-08-15 04:03:01 -04:00
Alex6511
2f750b261a Update wizard.dm 2015-08-15 03:55:57 -04:00
DZD
16bdb00351 Nukes useless /wizard/ spell pathing 
This had no fucking reason to exist, Shadowling spells are not wizard
spells, genetics powers are not wizard spells, ghost Booing is not a
wizard spell, etc.
 2015-08-08 14:06:50 -04:00
TheDZD
171c0d2d6c Merge pull request #1387 from Aurorablade/STILLALOTOFBLOOD 
[Need Feedback] TG Slaughter Demon Port Remake, THE REGIBBINGING
 2015-08-07 18:19:38 -04:00
Aurorablade
bec3b6bf6e Typo and color macro fix 2015-08-06 23:57:34 -04:00
Fox-McCloud
050e111157 Merge pull request #1603 from TheDZD/shadowling 
Shadowling Updates
 2015-08-05 20:26:25 -04:00
DZD
d9bb30f47a Replaces typesof with subtypesof where applicable 2015-08-03 11:04:28 -04:00
DZD
ed24ac47de Up to date with -tg- 
- Ports /tgstation/-tg-station#10871.
- Fixes some errors currently present in the above.
- Ports /tgstation/-tg-station#9927.
 2015-07-31 18:15:45 -04:00
Aurorablade
d962bf6b7d CRAWL! 
Made changes based on feedback.
 2015-07-29 16:42:51 -04:00
Aurorablade
0bb5dd626b Colonectomy 
Various fixes by feedback
Render Item refactor to modular system
 2015-07-20 17:04:32 -04:00
Aurorablade
f4bc0a2f7a Opps.... 
NOTHING TO SEE HERE
 2015-07-18 14:58:01 -04:00