cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-26 02:02:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
25,250 Commits 26 Branches 2 Tags
4dd3cd76bfbbaad07da58da9e7b63e06ebdf15be
Commit Graph

1679 Commits

Author SHA1 Message Date
TheDZD
15170405d4 Makes IsBanned use text2num for CIDs 
CIDs are text, not numbers, so this is necessary. Port of tgstation/-tg-station#13577, might finally sticky bans going haywire.
 2016-01-03 11:56:39 -05:00
Tastyfish
72d2db27c4 Fixed Test Areas and added checking for too many apc's 2016-01-01 01:57:48 -05:00
Fox McCloud
e67450d56d Merge pull request #3025 from Crazylemon64/infinite_antags 
Infinite antag tags
 2015-12-30 13:52:41 -05:00
Tigercat2000
9cb84e83ca Clean old shit, delete old files, move files, mrowl 2015-12-27 15:58:41 -08:00
Crazylemon
4133e98dfe Port of RemieRichard's infinite antag system 
This is just the first chunk, of fixing around the be_special flag stuff
It will probably break everything as-is
 2015-12-25 22:51:02 -08:00
Fox-McCloud
bbf3b528c4 Field Generator Refactor+Fixes 2015-12-22 13:40:53 -05:00
Tigercat2000
0e3c1f7fc6 Merge remote-tracking branch 'upstream/master' into I_WILL_FUCKING_NUKE_THIS_GODDDDAMMMNIIITTT 2015-12-13 09:25:04 -08:00
Tigercat2000
3d71483372 /vg/ / -tg- asset_cache 
Port of -tg-'s port of /vg/'s asset cache
Funny thing is, this actually replaces an old version of /vg/'s asset
cache we already had
IT'S A PORT OF A PORT REPLACING A PORT
POOOOOOOOOOOOOORTCEPTION

Basically, gets rid of the 30-40 second interface lag when you first join,
via *mumblemumble* MAGIC!

Also moves a few nano files around.
 2015-12-12 21:25:04 -08:00
Fox-McCloud
1de87cf143 ASS DAY ALL DAY EVERY DAY TODAY IS ASS DAY 2015-12-09 19:27:41 -05:00
Fox-McCloud
5a1528a76a Sticky Ban Fix 2015-12-09 19:16:16 -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
Tastyfish
f839b43bcc Merge remote-tracking branch 'origin/inputfix' into inputfix 
Conflicts:
	code/_onclick/hud/screen_objects.dm
	code/game/dna/genes/vg_powers.dm
	code/modules/admin/verbs/adminhelp.dm
	code/modules/economy/EFTPOS.dm
	code/modules/mob/living/silicon/robot/life.dm
 2015-11-30 22:44:55 -05:00
Tastyfish
280fc65938 added cancel to more powers, hand tele, cleanups to others 2015-11-30 22:30:57 -05:00
Tastyfish
897313844b Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into inputfix 
Conflicts:
	code/modules/mob/living/silicon/robot/life.dm
 2015-11-30 21:54:22 -05:00
Aurorablade
2f28c537c4 Removes Null 2015-11-30 07:46:06 -05:00
Aurorablade
8b39fa3bb1 Fixes custom enemy communications 2015-11-30 01:25:12 -05:00
Tastyfish
e2f67a4260 fixed various inputs to be cancel-able 2015-11-30 01:06:20 -05:00
Tastyfish
340068a25a fixed various inputs to be cancel-able 2015-11-29 18:30:30 -05:00
ZomgPonies
a94e4651d4 Replace one typo by another gg 2015-11-25 15:05:38 -05:00
ZomgPonies
428db7a842 Fixes enemy communications 2015-11-25 15:04:22 -05:00
ZomgPonies
e9df2e0627 Allows for command reports to come from other people than centcom 2015-11-23 18:13:47 -05:00
Tigercat2000
2a8c16b7aa Admin Virus2 Creator 
Basic Nano-module virus2 creator
Not feature complete, but good enough for basic use

Current features:
 - Make and delete virus datums
  - Randomized symptoms/effects on creation
 - Change effects for each stage
 - Change multiplier and chance for each stage
 - Spread to someone random or a specific chosen person (ignores bio
   protection)
 2015-11-06 07:57:32 -08:00
Fox-McCloud
bff03521b1 Wire Investigation 2015-11-03 06:35:51 -05:00
Fox-McCloud
c4341992d1 last tweaks 2015-10-22 21:52:20 -04:00
Fox-McCloud
77a354979c tweaks 2015-10-22 01:13:37 -04:00
Fox-McCloud
a404929d16 Multiverse Sword 2015-10-21 23:59:59 -04:00
TheDZD
9d45ee8b81 Merge pull request #2355 from Fox-McCloud/eye-fixes 
Eyes Fixes and Chem Tweaks
 2015-10-14 18:29:57 -04:00
Fox-McCloud
34eadf298e more 3 fixes 2015-10-12 22:28:25 -04:00
Fox-McCloud
9795dc761b Removes Nations and Unused Game Modes 2015-10-11 19:51:19 -04:00
Fox-McCloud
4c5706bc3a more...fixes 2015-10-10 08:52:35 -04:00
Fox-McCloud
27c420d87b corrects a few del's 2015-10-08 21:22:20 -04:00
Fox-McCloud
e17c6bde22 Another del->qdel pass 2015-10-08 16:49:10 -04:00
Fox McCloud
18a19df30f Merge pull request #2292 from tigercat2000/fancy 
-tg- style inventory update, stripping update
 2015-10-06 18:49:08 -04:00
Fox McCloud
559b03bfeb Merge pull request #2297 from Markolie/itemcolor 
Replace _color with item_color
 2015-10-06 16:11:35 -04:00
Markolie
bff7a9a80c Replace _color with item_color 2015-10-05 19:55:14 +02:00
Markolie
fdc3578582 Turn poll magic strings into defines 2015-10-05 19:25:05 +02: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
76db6db28a Better handling 2015-10-05 01:12:01 +02:00
Markolie
de930c24ba Admin panel client fix, goon DNA fix 2015-10-05 01:10:39 +02:00
Markolie
486c64c9c4 Going to keep it in the same meny 2015-10-04 21:42:26 +02:00
Markolie
ad3096c4ec More create poll improvements 2015-10-04 21:40:57 +02:00
Markolie
a5cfb1f45c Create poll fixes from /tg/ 2015-10-04 09:03:44 +02:00
Markolie
69c97863d5 Adminhelp update 2015-10-04 03:11:02 +02:00
TheDZD
8181354ffc Merge pull request #2261 from Markolie/fixesfixesfixesfixesfixesfixes 
Fixes
 2015-10-02 15:50:23 -04:00
TheDZD
de8e5ecfd0 Merge pull request #2254 from Markolie/swordnborg 
Syndicate borg update, add medical syndicate borg, energy sword refactor
 2015-10-02 15:49:57 -04:00
Markolie
00fc1dd812 Move up related accounts in the player panel 2015-10-02 04:31:52 +02:00
Markolie
f052512578 Fixes 2015-10-02 01:34:37 +02:00
Markolie
d40cfe582e Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into swordnborg 
Conflicts:
	icons/obj/surgery.dmi
 2015-10-01 04:32:10 +02:00
Markolie
d18b18b5b4 Syndicate borg update, add medical syndicate borg, energy sword refactor 2015-10-01 04:21:24 +02:00