cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-28 11:11:52 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,199 Commits 26 Branches 2 Tags
355666e1a825252a4d08fa4e5cfced85e107ce39
Commit Graph

9304 Commits

Author SHA1 Message Date
ZomgPonies
31ed63c384 Merge pull request #763 from tigercat2000/minorannoyances 
Fix a minor annoyance with alien nests
 2015-04-08 22:53:21 -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
DZD
d4616a8436 Goddamit git 2015-04-08 18:25:37 -04:00
DZD
b5c84a6818 RIP meta 
- Adds bite sounds and attack verbs to the toy carp plush.
- Adds in a foam armblade, obtainable from vending machines, in_hand
looks like a changeling armblade, but the item icon does not.
- Toy flash, makes the flash noise, always outputs the successful flash
noise to the screen, but does not actually do anything outside of that.
 2015-04-08 18:15:14 -04:00
Tigercat2000
5100bf407a Consistancy with handcuffs 2015-04-08 15:14:19 -07: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
32687467bb Merge remote-tracking branch 'upstream/master' into tgdice 2015-04-08 14:51:55 -07:00
ZomgPonies
800b42f315 Merge pull request #751 from tigercat2000/Guitar 
Ports Guitar from UristMcStation
 2015-04-08 17:49:32 -04:00
Tigercat2000
b40a82aecd Pod-Locator (probably temporary) sprites! 2015-04-08 13:55:40 -07:00
ZomgPonies
d951f999b9 Merge pull request #754 from tigercat2000/DndMinatures 
D&D Minifigures!
 2015-04-08 16:55:31 -04:00
ZomgPonies
5108942ed9 Merge pull request #752 from TheDZD/smoke 
Chemistry Smoke Changes
 2015-04-08 16:55:03 -04:00
Tigercat2000
54ed51d36b Initial commit for pod tracking device and misc pod equipment datum 2015-04-08 13:21:30 -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
Fox-McCloud
4bd18261e6 [Goonchem] Reagent Temperatures 2015-04-08 02:44:50 -04:00
Tigercat2000
3eb1339a65 -tg- Dice overhaul 2015-04-08 03:42:44 +02:00
DZD
810d626700 Smoke changes 
- Changes smoke so that it immediately affects all mobs in its area of
effect, smoke clouds are purely visual.
- Any mobs in the area of effect of a smoke reaction will be affected by
the smoke's touch reaction, and have all reagents in the smoke container
transferred into them.
- Smoke clouds are no longer opaque.
- Mixing 10u potassium, 10u sugar, and 10u phosphorus or higher will
cause an area of effect with a radius of 3 from the point of reaction.
Any less will have a radius of 2.
- Same with heating 10u smoke powder.
- Smoke powder reaction now only yields 1 powder instead of 3.
- Vent clog event has a radius 3 area of effect.

Fixes and uncommenting

- Uncomments honey turf reaction.
- Uncomments synthflesh turf reaction.
- Adds list for reagents to not copy via smoke (or more specifically,
delete when a smoke reaction happens without copying). This includes
sugar, phosphorus, potassium, and the smoke "reagent" produced in a
smoke reaction.
 2015-04-07 20:30:01 -04:00
setheri
705790298a Implemented Wellington's D&D miniatures. 2015-04-08 01:52:22 +02:00
Tigercat2000
71b0fcabba Make guitars actually obtainable, via cargostore, and table crafting 2015-04-07 16:50:10 +02:00
unknown
df0f4791df Adds a guitar! 2015-04-07 13:19:05 +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
ZomgPonies
f767cfa460 Merge pull request #741 from SamCroswell/TDomeUpdate 
Thunderdome Update
 2015-04-06 18:16:30 -04:00
SamCroswell
69c788449b Thunderdome - Create Teams Button 2015-04-06 11:59:02 -04:00
SamCroswell
e6a6803e24 Thunderdome - Reset Thunderdome Button 2015-04-06 11:22:21 -04:00
Tigercat2000
3681914d25 Thiiis is what I get for assuming obj/machinery is anchored by default 2015-04-06 13:52:42 +02:00
Fox-McCloud
9ca8def744 [Goonchem] Fixups 2015-04-05 21:56:59 -04: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
ca7c6f9db7 Merge pull request #734 from tigercat2000/SuicideActs 
Adds the most important suicide_act (Toy Katana)
 2015-04-05 19:03:35 -04:00
ZomgPonies
430e08574b Merge pull request #729 from SamCroswell/PosterUpdate 
Poster update
 2015-04-05 19:02:46 -04:00
ZomgPonies
3e5ccfd99e Merge pull request #728 from TheDZD/minor-fixes 
Mute Changes
 2015-04-05 19:02:34 -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
Tigercat2000
fcf6f268ee I can type, I swaer! 2015-04-05 23:44:22 +02:00
Tigercat2000
d9613e7a25 Adds the most important suicide_act 
Lolzy suicide_act for the replica katana, as requested by nomzy-xilia
 2015-04-05 22:12:47 +02:00
Fox-McCloud
afb8626670 [Goonchem] More Additions and Tweaks 2015-04-05 03:18:18 -04:00
SamCroswell
8485ae4bab Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into PosterUpdate 2015-04-04 23:05:18 -04:00
SamCroswell
57703695ed Poster Rework Part 3 2015-04-04 23:04:45 -04:00
ZomgPonies
c23f2019fe Merge pull request #725 from Fox-McCloud/brain-damage 
Lethal Brain Damage
 2015-04-04 22:07:39 -04:00
DZD
1fa2c164f9 Mute Changes 
- R_MOD is now needed to mute players.
- Admins/mods/mentors can now be muted. The first two can unmute
themselves, the third cannot.
- Global OOC mute now applies to mentors as well, but not to admins or mods.
- Global Deadchat mute still only applies to regular players.
- Mods using DSAY will show up as MOD instead of MENTOR.
 2015-04-04 20:05:42 -04:00
ZomgPonies
91e8b909c0 Squish Squash 2015-04-04 14:27:53 -04:00
ZomgPonies
1628202202 Merge pull request #724 from tigercat2000/ProcessorCleanup 
Cleanup food processor code
 2015-04-04 14:06:46 -04:00
ZomgPonies
e4816d2571 Merge pull request #721 from tigercat2000/PicketPort 
Adds Picket Signs (Port from -tg-)
 2015-04-04 14:04:59 -04:00
Fox-McCloud
1a81836556 Lethal Brain Damage 2015-04-04 01:51:04 -04:00
Tigercat2000
84827bd58c Cleanup Food* processor code 
Because 'process scheduler' is a waaay different system
 2015-04-04 04:47:42 +02:00
Fox-McCloud
d7d2dfc3c3 Science Department Restructuring---Xenobotany 2015-04-03 20:18:08 -04:00
AnturK
2dea395f32 - Adds Picket Signs 2015-04-04 00:07:20 +02:00
SamCroswell
98fd743f6d Adds Poster Supply Packs 2015-04-03 17:15:07 -04:00
SamCroswell
c6f5f1f8cd Poster Update 2015-04-03 16:45:44 -04:00