Commit Graph

9304 Commits

Author SHA1 Message Date
Bram961
1b75aacec0 Popping sound fix
Fixes the popping sound heared when white noise is toggled on.
2015-04-22 03:59:10 +02:00
DZD
8de0140dcc Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into shadowling
Conflicts:
	code/modules/mob/living/carbon/human/human.dm
	code/setup.dm
2015-04-21 18:56:34 -04:00
Fox-McCloud
e8038738f6 Merge pull request #800 from ZomgPonies/shadow
Mutantrace update
2015-04-21 18:36:24 -04:00
ZomgPonies
bc9a6fe09e Merge pull request #839 from tigercat2000/MassDriveVG
Code rework of placing things on walls.
2015-04-21 17:31:45 -04:00
ZomgPonies
5a51494ca6 Merge pull request #850 from Fox-McCloud/tators
Traitor Item Additions and Surplus Crates
2015-04-21 17:31:34 -04:00
Tigercat2000
d755275599 Make violins and guitars f10 again
This commit makes violins and guitards have a force of 10 again,
because it was complained about.
2015-04-21 04:59:52 -07:00
Fox-McCloud
9885688934 Traitor Item Additions and Surplus Crates 2015-04-21 03:05:12 -04:00
Tigercat2000
3dacab94a8 Adds hitsounds to violin and guitar
they were missing them
now they aren't
fancy sproingy hitsound for guitar
2015-04-20 08:31:55 -07:00
ZomgPonies
8c7eec4c29 Merge pull request #837 from Bram961/Ambience-split
Splitting shipambience.ogg from toggle ambience
2015-04-20 08:24:37 -04:00
ZomgPonies
77534a6fa3 Merge pull request #831 from Fox-McCloud/hostilemobs
TG Spider Port
2015-04-20 08:22:03 -04:00
ComicIronic
44aa2ba225 Code rework of placing things on walls.
Stuff goes under types.
Types have procs.
Never have 500 lines of repeated code again.

I came very close to crying while editing this. You should appreciate
that.

----

This commit entirely reworks how placing things on walls work- Posters
have intentionally been left alone to reduce the amount of lines
changed. With this commit, wall-mounted objects are no longer snowflaked
into the wall file.
2015-04-19 14:29:42 -07:00
Bram961
4950e9c59a Splitting the Ambience and background noise
Splits off Ambience sounds and the background "shipambience.ogg" under
two difrent buttons.
2015-04-19 13:29:27 +02:00
Fox-McCloud
af925be951 TG spider port 2015-04-18 10:41:04 -04:00
Fox-McCloud
df94ccb855 fix for infinite explosions 2015-04-17 23:07:22 -04:00
Fox-McCloud
33233941d5 [Goonchem] Reagent Decals 2015-04-17 18:27:49 -04:00
ZomgPonies
98af2982c8 Merge pull request #820 from tigercat2000/Spraycans
Adds spraycans, fixes lipstick, modifies scleaner
2015-04-16 16:39:19 -04:00
ZomgPonies
e2b47e8eab Merge pull request #817 from tigercat2000/SMASHtable
Makes glass tables smash when someone is tabled
2015-04-16 16:37:57 -04:00
ZomgPonies
7a863e53ab Merge pull request #816 from CrAzYPiLoT-SS13/master
Hydro fix & colorful corgis
2015-04-16 16:37:47 -04:00
ZomgPonies
e6d7a6f67b Merge pull request #801 from Fox-McCloud/vending
[Goonchem] New Vending Machines
2015-04-16 16:37:32 -04:00
ZomgPonies
ee5961d73e Merge pull request #793 from Fox-McCloud/chainsaws
Adds in Chainsaws
2015-04-16 16:36:20 -04:00
Fox-McCloud
d250e38067 Merge pull request #811 from Artorp/electricchair
Electric Chair update
2015-04-16 00:20:10 -04:00
Sawu
d038a0710c Adds spraycans, fixes lipstick, modifies scleaner
This commit does the following:
 - Adds spraycans as a subtype of crayons.
   - Slight crayon overhaul to make room for this
   - Can spray graffiti, runes, and letters on floors & walls
   - Can spray mobs and paint their face

 - Fixes & overhauls lipstick
   - Lipstick is now overlay and Blend() based.
   - Also fixes a few bugs with the system.
   - Updates paper code to accomodate for wiping off spraypaint as well

 - Slight modification to space cleaner
   - Space cleaner now cleans your face of lipstick and spraypaint
2015-04-15 17:19:08 -07:00
Tigercat2000
796695a56b Makes glass tables smash when someone is tabled
This commit does the following:
 - Fixes a minor spelling mistake.

 - Moves glass tables breaking into a proc, was messy otherwise.

 - Changes grab-smash behavior. 'Tabling' someone will now smash the
   glass table, and weaken them for about the same length as a baton.
2015-04-15 12:59:31 -07:00
Matt
21929eded3 Hydro fix & colorful corgis
Hydro fix, fixes http://www.github.com/ParadiseSS13/Paradise/issue/683
Added corgis random color when splashed with colorful reagent.
2015-04-15 11:31:31 +02:00
Artorp
1061bddc35 Added electric chair to map 2015-04-14 23:50:55 +02:00
Artorp
949a6349a2 Electric Chair update
- Changed toggle verb into activation verb
- Added support for spawned/mapplaced e-chairs
- Fixed activation animation
- Fixed updating of icon
- Buffed damage, victim will die much quicker
- Removed stun
2015-04-14 21:36:22 +02:00
DZD
6d10960884 Minor fixes
- Mutetoxin does not exist, replaced with Capulettium Plus in
Shadowling's Glare
- Makes chrysalis walls actually have sprites.
2015-04-13 17:59:53 -04:00
Tigercat2000
acc3755a98 Adds glass tables, glass table frames
This commit adds glass tables (credit to WalterJe of -tg-'s fourms for
the sprites) to the game. These can be constructed with two metal
sheets, and two glass sheets. Flipping the table causes it to shatter
and deconstruct itself. You can deconstruct the table at any stage
with a wrench.
2015-04-13 06:29:05 -07:00
ZomgPonies
8de1428b51 Completely remove the deprecated mutantrace stuff 2015-04-13 08:07:58 -04:00
ZomgPonies
1b4bfe1196 Removing all mutantrace crap except for slimepeople 2015-04-13 06:20:17 -04:00
Fox-McCloud
aaf3be77fb New Vending Machines 2015-04-13 03:27:41 -04:00
Fox-McCloud
d04b9ad0de tweak 2015-04-12 19:57:27 -04:00
DZD
00035a51f0 It compiles!
- Makes shadowlings compile, require snowflaking of a few things to the
human Life() proc due to how Bay species works.
- Renames monkeyizing var to notransform, as that's effectively what it
was used for, to prevent transformation. (/tg/ port)
2015-04-12 19:54:45 -04:00
DZD
0ab3a54fcb Copy-Paste Port of /tg/station's Shadowlings
Ports tgstation/-tg-station#8157

This won't compile, needs to be bugfixed and tested. The only reason I
am PRing  this right now is so that we don't have multiple people
working on the same thing.

@ZomgPonies This will require PROBABILITY SHADOWLING # to be added to
game_options.txt, and will likely require SQL database additions for the
BE_SHADOWLING antag preference.
2015-04-12 13:15:40 -04:00
Tigercat2000
29c59bd51b Add check for antags in msg_admin_attack
This commit first adds a new helper proc labeled isAntag(), as well as
adding a check for antags for every instance of msg_admin_attack().

Goals of this commit:
 - Make admin ATTACK: logs indicate if attacker is an antagonist.

Note; High probability of merge conflicts, 47 files changed.
2015-04-12 08:41:53 -07:00
Fox-McCloud
421c27b4e4 chainsaw fixups 2015-04-12 07:44:11 -04:00
Fox-McCloud
ff0f29c5e5 Chainsaws 2015-04-12 04:47:17 -04:00
ZomgPonies
a2830a6ce2 Merge pull request #787 from tigercat2000/ProceduralMap
Procedural Map Generator System (Port from -tg-)
2015-04-12 04:36:43 -04:00
DZD
dae033a6a5 Pipe Fingerprint Transferring
- Wrenching down a pipe will now transfer prints from the pipe object to
the pipe machine. Vice versa for unwrenching a pipe.
- Wrenching down or unwrenching a pipe will now leave a fingerprint on
the pipe.
2015-04-11 22:52:42 -04:00
Remie Richards
0f7b09ef07 Procedural Map Generator System
This commit adds a Procedural map generating system for code and admins to
use ingame. The system is modular, which means that it is fairly easy to
make new generating systems. Currently, only the 'nature' unsimulated
system is implemented, as a testing verb for admins to use. Admins can
define the starting XYZ and ending XYZ of the generated system.

Players - This means you may see content that is truely random, in the
future.

Coders - This system allows you to randomize map elements. Writing new
modules is documented at
code/modules/procedural-mapping/mapGeneratorReadme.dm
Detailed information about how the system works, and how it can be
integrated is also avalible there.

Admins - This system will allow you to, at the touch of a button, create
very complex structures and turfs that would otherwise require being
spawned in manually, one by one. The nature button is a fairly good
example of this, with it's randomized grass textures, randomly placed
trees, and randomly placed rocks. This would normally take a good 5
minutes to do, spawning the trees and rocks and turfs, but it takes about
20 seconds to enter the coordinates and have it be completely random.
2015-04-11 05:28:10 -07:00
ZomgPonies
e3050f5cc1 Merge pull request #771 from Fox-McCloud/nukies
Nukies--Chemsprayer and New Grenades
2015-04-09 16:22:19 -04:00
ZomgPonies
0f1ceaadfb Merge pull request #774 from tigercat2000/cryoalert
Minor cryostorage fix, admin-related feature of cryostorage
2015-04-09 16:22:08 -04:00
ZomgPonies
e384ff688b Merge pull request #772 from tigercat2000/IDfix
Fix ID examine gender, Agent card overhaul
2015-04-09 16:21:32 -04:00
ZomgPonies
00b2ad3fbd Merge pull request #770 from TheDZD/muh_valids
Anti-Meta Paraphernalia
2015-04-09 16:21:17 -04:00
ZomgPonies
9995539d4e Merge pull request #769 from tigercat2000/trackinpods
Spacepod tracking devices
2015-04-09 16:21:05 -04:00
ZomgPonies
68c20e32f7 Merge pull request #759 from Fox-McCloud/temperature
[Goonchem] Reagent Temperatures
2015-04-09 16:20:38 -04:00
Tigercat2000
b428e91746 Admin alert for aghosted bodies being put into cryostorage, oversight fix
which allowed people to break cryopods.
2015-04-09 10:59:50 -07:00
Tigercat2000
173d746214 wow I left an entire unused proc in I am so good at this 2015-04-09 05:20:55 -07:00
Tigercat2000
eeed80e120 Fix ID gender, bit of an agent-ID overhaul 2015-04-09 05:10:41 -07:00
Fox-McCloud
b8230aefe6 Nukies--Chemsprayer and New Grenades 2015-04-08 23:39:07 -04:00