cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-09-01 00:18:13 +01:00
Code Issues Packages Projects Releases Wiki Activity
15,389 Commits 14 Branches 2 Tags
085de1b71c244b91c19cf101f664f968e3d81224
Commit Graph
11611 Commits
Author SHA1 Message Date
GlloydandZomgPonies 085de1b71c Resolves #2213 Fixes the back icons for the scythe and the Roman shield. 
Conflicts:
	icons/mob/back.dmi
 2014-01-19 05:32:34 -05:00
RKF45andZomgPonies 1f0e1f6209 Rework of colour mixing 
Conflicts:
	code/modules/reagents/Chemistry-Colours.dm
 2014-01-19 05:29:40 -05:00
Rob NelsonandZomgPonies cd2c20a6fe NEW BOO SYSTEM! 
Conflicts:
	code/datums/spell.dm
	code/modules/mob/dead/observer/observer.dm
 2014-01-19 05:22:20 -05:00
ZomgPonies bd19698615 Merge pull request #119 from SamCroswell/master 
CentComm changes
 2014-01-18 12:29:19 -08:00
ZomgPonies 1883939d18 Merge pull request #120 from alex-gh/sparkles-icon 
Firesuits no longer protect against pressure damage.
 2014-01-18 12:29:07 -08:00
alex-gh f807c1c938 Added 'Sparkles' to the AI selection 2014-01-18 08:08:38 +01:00
SamCroswell d498adb324 Ninja / CentComm changes 2014-01-18 00:34:24 -05:00
d3athrowandZomgPonies bcd6a3c420 Maybe fix #288 2014-01-17 13:10:18 -05:00
Rob NelsonandZomgPonies b5a1eff678 Add ghost radio 
Conflicts:
	code/modules/client/preferences.dm
	code/world.dm
 2014-01-17 13:10:00 -05:00
Rob NelsonandZomgPonies 985f164541 Add "Die a glorious death" objective. 2014-01-17 13:03:30 -05:00
Ccomp5950andZomgPonies b15fb8a04b Supermatter update. 
Now gives an instability% warning in it's messages.

Limited the "If they can see it and aren't wearing mesons, have some hallucinations" range to a max of 7

Can't be pelted with lasers while out in space allowing for unlimited power only to drag it back on a turf and instantly explode.

Removed extra if(!removed) check, we already checked for that above.

Moved the oxygen ratio variable "oxygen" to be declared under the object instead of it's process proc for easier debugging.

Changed the alert interval.

Add luminosity value so the big glowing shard of supermatter actually generates light.

Conflicts:
	code/modules/supermatter/supermatter.dm
 2014-01-17 09:06:00 -05:00
Ccomp5950andZomgPonies 7541463e01 Moved Supermatter.dm out of the WorkInProgress directory. 
Conflicts:
	baystation12.dme
 2014-01-17 09:01:09 -05:00
FurlucisandZomgPonies d7bb62fc90 Tweaks homunculi 
Makes them a bit creepier, and makes it so they don't spawn with
underwear. Because really, if the rune spawns anything, it should be
robes. But that would make things too easy.
 2014-01-17 08:57:41 -05:00
FurlucisandZomgPonies 208f5fd592 Removes the second holywater 
Deletes the second kind of holy water that doesn't do anything. Lemme
know if I should do the opposite of this.

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm
 2014-01-17 08:57:11 -05:00
AranclanosandZomgPonies eb76256f04 Adds the captain's medal to the medal's lockbox. 
Fixes issue 2358

Conflicts:
	code/game/objects/items/weapons/storage/lockbox.dm
 2014-01-16 21:55:00 -05:00
alex-gh a1c600d9b8 Made DS suits spaceproof 2014-01-16 20:42:09 +01:00
alex-gh e9d2314386 Firesuits no longer protect against pressure 2014-01-16 20:28:40 +01:00
alex-gh f390a11d07 Runtime fix 2014-01-16 17:14:57 +01:00
alex-gh fd9c78dd85 Assembly holders get destroyed by explosions. 2014-01-16 17:10:41 +01:00
ZomgPonies 1b4a48a8f7 Fueltank bombs no worky 2014-01-16 09:28:08 -05:00
ZomgPonies 48403dcc8e A lot of fixing up job preferences. 2014-01-16 09:18:49 -05:00
ZomgPonies 2525a3d057 Added barber karma job 2014-01-16 08:42:36 -05:00
ZomgPonies 6dbf776ff4 Gamme to shuttle, part two 2014-01-16 06:57:17 -05:00
ZomgPonies 031f67110b Fixes some sounds 2014-01-16 05:23:32 -05:00
ZomgPonies 90909b304a Merge pull request #116 from SamCroswell/master 
EXTREMELY buggy Ninja code
 2014-01-16 01:52:19 -08:00
ZomgPonies 2f2e6c611f Re-added? Stop drop and roll 2014-01-16 03:47:26 -05:00
d3athrowandZomgPonies c8ceab5aa2 Adds Randomized Character Slot, if enabled picks a random populated character slot to use upon round start. Does not affect late joins for now. 
Conflicts:
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	html/changelog.html
 2014-01-16 00:48:24 -05:00
ZomgPonies b80552169c Stupid type 2014-01-15 13:13:13 -05:00
ZomgPonies 42f286f210 Fixing Gamma armory exploits 2014-01-15 13:06:47 -05:00
ZomgPonies 391cad7d5f Trying to add xenor to traitor panels 2014-01-15 11:56:59 -05:00
ZomgPonies 1caf56a29f Buff pulse rifles 2014-01-15 08:10:40 -05:00
ZomgPonies a99b45a3bd Able to melt decapitated heads into skulls with acid 2014-01-15 08:10:33 -05:00
ZomgPonies d40ebc5cc5 Revert "Tradeband and Gutterspeak now have a different font than Tradeband." 
This reverts commit b5906bba39.

Conflicts:
	code/modules/mob/living/carbon/human/human.dm
 2014-01-15 06:54:46 -05:00
ZomgPonies 3a540cbbce Forgot one 2014-01-15 01:54:21 -05:00
Mark Aherne (Faerdan)andZomgPonies c1c49fe6d8 Canister, Tank & Tank Transfer Value NanoUIs. 
* Added Canister, Tank & Tank Transfer Value NanoUIs.

Conflicts:
	code/game/machinery/atmoalter/canister.dm
	nano/css/shared.css
 2014-01-15 01:53:51 -05:00
SamCroswell 51a4a6ee4f EXTREMELY buggy Ninja code 2014-01-14 23:58:21 -05:00
IncomingandZomgPonies 048ed6e9fd [tumblr approved] Sausage Party Reduction 
*Lets adamantine golems and ninjas generate female where before they were generated exclusively male.

The ninja spacesuit has a coded in female variant that has existed forever but was not actually used. It only shows up upon suit ACTIVATION because (?:?:?)|\|i|\|j4c0d3(?:?:?).

Likewise female adamantine golems have their own sprites and can show up in staff of change shots, but ones generated from the rune were always male.

This does NOT effect admin summoned unknown humans, those are all still male.

Conflicts:
	code/modules/events/tgevents/ninja.dm
	code/modules/mob/living/carbon/metroid/metroid.dm
 2014-01-14 22:55:39 -05:00
ManeaterMildredandZomgPonies 671b886564 Added costs for the Mech Ion Rifle and the Mech Rocket Launcher. 2014-01-14 22:43:03 -05:00
ManeaterMildredandZomgPonies c016debe54 Added the Mech Ion Rifle, Mech Carbine, Mech Rocket Launcher 
and Ion Rifle to the list of things you can build with the
Protolathe and Exosuit Fabricator.
 2014-01-14 22:42:50 -05:00
ZomgPonies e8e846400f Extra fixes to secure Gamma armory 2014-01-14 11:08:35 -05:00
d3athrowandZomgPonies f16a6a83db clean up the code 
Conflicts:
	code/modules/mob/mob.dm
 2014-01-14 04:30:13 -05:00
d3athrowandZomgPonies bf275e1964 Should fully resolve issue #344 
Conflicts:
	code/modules/mob/mob.dm
 2014-01-14 04:25:24 -05:00
ZomgPonies 1dc7b05b76 Gibsound changes 2014-01-14 04:17:42 -05:00
ZomgPonies 5ab05ae5ee Compile fix 2014-01-14 00:42:13 -05:00
Rob NelsonandZomgPonies 319ae54216 Make some adjustments to catwalks. Fixes #402, #404. 
Conflicts:
	code/game/turfs/simulated/floor_types.dm
 2014-01-14 00:40:30 -05:00
alex-gh 601c6a9021 Ion storms can actually emag bots now 2014-01-14 00:39:06 +01:00
HornygrannyandZomgPonies 95835ac98c Changed neurotoxin from a child of energy to a child of bullet 
Conflicts:
	code/modules/projectiles/projectile/bullets.dm
 2014-01-13 04:36:15 -05:00
HornygrannyandZomgPonies 550d9b2e76 Extra indents removed 2014-01-13 04:27:44 -05:00
HornygrannyandZomgPonies 5a443e5010 Replaced spaces with tabs. 2014-01-13 04:27:18 -05:00
HornygrannyandZomgPonies 6eefff2c68 Code by Giacom. Changes alien neurotoxin spit to dumbfire. 
Conflicts:
	code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm
 2014-01-13 04:27:08 -05:00