Commit Graph

639 Commits

Author SHA1 Message Date
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
Fox-McCloud
d250e38067 Merge pull request #811 from Artorp/electricchair
Electric Chair update
2015-04-16 00:20:10 -04: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
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
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
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
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
Tigercat2000
5100bf407a Consistancy with handcuffs 2015-04-08 15:14:19 -07:00
Tigercat2000
80a67b31aa Make alien nests inform people that their efforts will actually work, for
consistancy with EVERY OTHER BED.
2015-04-08 13:22:06 +02:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
ZomgPonies
f7fb4f0376 Merge pull request #703 from Svej/ntrephat
Nanotrasen Representative hat
2015-03-30 13:54:26 -04:00
Svej
a0e1cd5683 Nanotrasen Representative hat
Adds a fancy hat to the NT Reps locker
2015-03-30 14:10:28 +02:00
ZomgPonies
7e1f7a0b22 Merge pull request #680 from tigercat2000/spiritboard
Spirit Boards! (from -tg-)
2015-03-29 01:02:59 -04:00
ZomgPonies
e2a4ccc8a6 Merge pull request #681 from Fox-McCloud/End-Era
[Goonchem] Transition to Goonchem
2015-03-28 12:25:35 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04:00
Tigercat2000
202f8e81d8 Make actually work, grgrgr. 2015-03-26 21:03:23 +01:00
Cheridan
6796dcce29 Adds logging, fixes typo 2015-03-26 20:11:02 +01:00
Tigercat2000
b4a2d26274 fixstrangestuff 2015-03-26 20:10:45 +01:00
Cheridan
d012d77a7d Spirit Boards!
Conflicts:
	icons/obj/objects.dmi
	tgstation.dme
2015-03-26 20:00:44 +01:00
Cheridan
acba4c6cf6 Adds construction permits
Conflicts:
	code/game/gamemodes/objective_items.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/paperwork/photography.dm
	icons/obj/items.dmi
2015-03-26 18:52:29 +01:00
Fox-McCloud
b30d3f795f Goonchem Map Changes 2015-03-24 22:48:25 -04:00
Fox-McCloud
8da3cb1de5 Merge pull request #616 from tigercat2000/BorgIlocker
Allow borgs to open-close lockers properly
2015-03-22 18:00:35 -04:00
Tigercat2000
689713ddbd Add clickdelay to attacking statues 2015-03-22 18:24:20 +01:00
Tigercat2000
b9adc59d26 Allow borgs to open-close lockers properly 2015-03-21 14:28:29 +01:00
Mark van Alphen
b5b4d6f178 Merge pull request #604 from Fox-McCloud/Science-Job
Science Job Homogenization and Test Lab
2015-03-21 14:06:03 +01:00
Fox-McCloud
01fa55adda Test Lab 2015-03-20 07:11:30 -04:00
ZomgPonies
0ee915abeb Merge pull request #602 from Fox-McCloud/Recursive-Explosions
Removes Recursive Explosions
2015-03-20 02:58:54 -04:00
Fox-McCloud
38adfe06a0 Removes Recursive Explosions 2015-03-19 03:23:14 -04:00
DZD
f81848033f Comments out plasma mineral doors burning 2015-03-18 22:15:41 -04:00
Markolie
747c2f9a57 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise
Conflicts:
	code/game/turfs/simulated/floor.dm
2015-03-17 16:18:42 +01:00
Markolie
12aaa6a93e Bug fixes 2015-03-17 16:16:44 +01:00
ZomgPonies
09d8e839ef Merge pull request #582 from Fox-McCloud/Escape-Pods
Escape Pod Fixes and Tweaks
2015-03-17 08:29:40 -04:00
Markolie
cacc2bf917 Fixes 2015-03-16 18:49:47 +01:00
Fox-McCloud
604b4bb28a Escape Pod Fixes 2015-03-16 02:18:35 -04:00
Fox-McCloud
a31cdc9091 Merge pull request #572 from SamCroswell/NinjaDev
Ninja Restructure
2015-03-15 16:58:41 -04:00
SamCroswell
62ae69c816 Ninja File Structure Rework
Restructures the ninja files into a more spaced-out version, compliments
of /TG/. The energy katana is also their handiwork.

Add an emag act to crates and lockers instead of handling everything in
attackby.
2015-03-13 20:42:54 -04:00
ZomgPonies
66dd040130 Gives the ability to stop someone climbing a table 2015-03-09 22:55:30 -04:00
SamCroswell
65b530fbe6 Locker Fix - Part Zwei 2015-03-08 21:01:01 -04:00
SamCroswell
03a13fca3a Locker Fix 2015-03-08 20:53:47 -04:00
Fox-McCloud
89f2aea30d Insulated Gloves Fix 2015-03-08 19:12:35 -04:00
SamCroswell
5bb63a7f63 Merge Conflict Resolution
Conflicts:
	icons/obj/clothing/gloves.dmi
2015-03-08 15:59:20 -04:00
SamCroswell
9b87487783 Minor Fixes 2015-03-07 23:13:00 -05:00
Fox-McCloud
4e4e7ae77f Crayons and Gloves 2015-03-06 21:40:57 -05:00
ZomgPonies
463204c913 Merge pull request #493 from Markolie/master
NanoUI synth airlock control, ERT equipment rework, fixes
2015-03-03 21:28:22 -05:00
Markolie
4ac1007d82 ERT equipment rework 2015-03-03 22:51:54 +01:00
SamCroswell
b8a9c902a1 Removes Space Ninjas 2015-03-02 19:05:44 -05:00
ZomgPonies
6979cf6089 Merge pull request #477 from Fox-McCloud/Chemistry-Cleanup
Chemistry Cleanup and Fixes
2015-03-01 23:08:16 -05:00
Fox-McCloud
3bed31e08c Chemistry Cleanup and Fixes 2015-03-01 16:34:23 -05:00
ZomgPonies
2b917b17cd Merge pull request #475 from Markolie/master
Bug fixes galore
2015-03-01 14:41:42 -05:00