cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-26 09:21:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
20,892 Commits 28 Branches 2 Tags
b91d86abcdf37a7fd0361807e38c507bb7aa8938
Commit Graph

1557 Commits

Author SHA1 Message Date
Tigercat2000
b91d86abcd Makes RCD qdel doors 
This still doesn't fix the turf-not-updating bug, but it does make the RCD
qdel doors.
 2015-04-29 20:26:59 -07:00
Tigercat2000
62657448d4 Reintegrate mob fire 
I took out the entire on_fire system to work on LINDA. This commit readds
it.
 2015-04-28 13:57:58 -07:00
Tigercat2000
4f1053f5b7 LINDA, Stage 1 
This commit ports the base system of LINDA from TG. This version of linda
is the original version, with none of -tg-'s fixes, rewrites, or other
such improvements attached.

The mob ignite system has been 100% removed, as LINDA does not support
this normally. It may be added back in when the improvements and refactors
to LINDA have been ported.
 2015-04-28 08:43:42 -07:00
Fox-McCloud
9885688934 Traitor Item Additions and Surplus Crates 2015-04-21 03:05:12 -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
ee5961d73e Merge pull request #793 from Fox-McCloud/chainsaws 
Adds in Chainsaws
 2015-04-16 16:36:20 -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
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
Fox-McCloud
d04b9ad0de tweak 2015-04-12 19:57:27 -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
e3050f5cc1 Merge pull request #771 from Fox-McCloud/nukies 
Nukies--Chemsprayer and New Grenades
 2015-04-09 16:22:19 -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
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
DZD
395e4b2cad Don't kill me please 
- Changes cattle prod to w_class 4, meaning it can no longer fit in
backpacks.
 2015-04-08 18:41:35 -04:00
Tigercat2000
f026083397 Obtainable dice and D&D figures 
- Adds D&D figure box to library
 - Adds both full dice set box and D&D figure box to cargo store
 2015-04-08 15:03:43 -07:00
Tigercat2000
3eb1339a65 -tg- Dice overhaul 2015-04-08 03:42:44 +02:00
Fox-McCloud
dec621eefd Revert "R&D Research Levels Unification" 2015-04-07 01:16:19 -04:00
ZomgPonies
4e9daf6aa8 Merge pull request #746 from jack-fractal/write-research-debug 
R&D Research Levels Unification
 2015-04-06 23:28:27 -04:00
jack-fractal
a0be969870 Unifying tech levels 
Unifies tech levels between design and their products.
 2015-04-06 22:07:44 -04:00
Tigercat2000
34d0bdc946 Fix exploit to get around delay, change to notice instead of warning 2015-04-07 02:26:25 +02:00
Fox-McCloud
7c739e4745 Merge pull request #710 from ZomgPonies/limb 
Port of the BS12 limb overhaul
 2015-04-05 19:06:39 -04:00
ZomgPonies
e733d1caf0 Merge pull request #730 from Fox-McCloud/tweaks-and-tweaks 
[Goonchem] More Additions and Tweaks
 2015-04-05 19:02:18 -04:00
Fox-McCloud
fb03e1bc88 updates 2015-04-05 17:54:48 -04:00
ZomgPonies
c23f2019fe Merge pull request #725 from Fox-McCloud/brain-damage 
Lethal Brain Damage
 2015-04-04 22:07:39 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
Fox-McCloud
1a81836556 Lethal Brain Damage 2015-04-04 01:51:04 -04:00
AnturK
2dea395f32 - Adds Picket Signs 2015-04-04 00:07:20 +02:00
Fox-McCloud
0efdc07191 [Goonchem] Few Recipes Tweaks 2015-04-03 01:25:42 -04:00
Fox-McCloud
796dbf233a [Goonchem] Tweaks, Fixes, etc. 2015-03-28 21:16:13 -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
361554d3b2 Forgot Nicotine in cigs 2015-03-28 05:38:15 -04:00
Artorp
046096684b Revert "Change space law iframe wiki link" 2015-03-27 23:53:52 +01:00
Fox-McCloud
a40ee14f2c Forgot 2015-03-27 07:19:13 -04:00
Fox-McCloud
d1932c0f64 [Goonchem] Transition to Goonchem 2015-03-27 05:41:45 -04: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
d90167193a Merge pull request #670 from ZomgPonies/court 
Adds gavel and block to magistrate
 2015-03-26 11:01:35 -04:00
Fox-McCloud
42d2373c01 Borg Defib Fixes 2015-03-26 01:14:41 -04:00
ZomgPonies
d604a50dd8 Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into court 
Conflicts:
	icons/obj/items.dmi
 2015-03-25 10:23:14 -04:00
ZomgPonies
7fdfa9c6a7 Adding gavel and block 2015-03-25 10:22:04 -04:00
Fox-McCloud
4d2a77dbf7 Merge pull request #653 from ZomgPonies/headspear 
Sticking heads on spears
 2015-03-25 09:37:36 -04:00
Fox-McCloud
b3270fe360 Merge pull request #650 from ZomgPonies/beartraps 
IED fix and trap
 2015-03-25 09:37:08 -04:00
ZomgPonies
17dfe4e481 Merge pull request #668 from Fox-McCloud/Goonchem-Stuffs 
[Goonchem] FirstAid Transitions and Chem Adjustsments+Fixes
 2015-03-25 09:33:21 -04:00
Fox-McCloud
3e1fac8c94 [Goonchem] FirstAid Transitions 2015-03-25 08:45:36 -04:00
Fox-McCloud
dbb04f4dbb [Goonchem] Few Additional Chemicals 2015-03-25 03:50:54 -04:00