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
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
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
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
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
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
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
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
SamCroswell
63337efdb8
DS Radio and Rapid Deployment Fix
2015-03-29 19:25:32 -04:00
ZomgPonies
0b630c4ca7
Merge pull request #691 from jack-fractal/pda_logs
...
Adding extra logging information to PDA for refactor prep
2015-03-29 01:02:05 -04:00
Fox-McCloud
796dbf233a
[Goonchem] Tweaks, Fixes, etc.
2015-03-28 21:16:13 -04:00
jack-fractal
f62f91f04e
Adding extra logging information to PDA
...
This significantly expands the level of detail for logging what PDAs.
2015-03-28 15:32:11 -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
Tigercat2000
b8101ed6be
w_classes, NEED W_CLASSES, gaah.
2015-03-26 19:21:32 +01:00
Tigercat2000
62f72163c7
Compileerrorfix, update items.dmi
2015-03-26 19:00:25 +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
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
