Fox-McCloud
1c1eec3210
Tweaks and Fixes 2.0
2015-05-22 16:29:12 -04:00
ZomgPonies
2a0dcedd64
Couple of superhero fixes
2015-05-12 08:10:04 -04:00
Krausus
9d712fe623
Fixes pill bottles not grouping their contents
2015-05-11 09:11:11 -04:00
Krausus
65ce3e4c20
Fixes numbered contents grouping different things
...
Also fixes a runtime from the black powder fix. Whoops!
2015-05-11 08:53:14 -04:00
Fox-McCloud
dbaf893fe6
Merge pull request #971 from Krausus/QuickDumping
...
Improved Dumping for Containers
2015-05-09 20:33:06 -04:00
Krausus
6ef0c00921
Adds missing canmove check
2015-05-09 07:41:21 -04:00
Krausus
5567c99a44
Adds drag-drop emptying to all containers
...
Also, fixes several missing checks and a facing mistake.
2015-05-09 02:25:38 -04:00
TheDZD
6515b10ccc
Merge pull request #963 from ZomgPonies/superhero2
...
Superhero Overhaul Part 2: Magnetic Boogaloo
2015-05-08 16:55:59 -04:00
Krausus
d8e6893e35
Improves dumping of "quick" containers
...
Allows all "quick" containers to be dumped into a disposal (click) or
onto a table (drag-drop).
2015-05-08 07:20:44 -04:00
Fox-McCloud
b20104b360
Various Fixes and Tweaks
2015-05-07 23:31:39 -04:00
ZomgPonies
d3a8caddbf
Makes Owlman's belt reload every 60 seconds
2015-05-07 18:04:12 -04:00
Fox-McCloud
828e3c9927
Merge pull request #952 from ZomgPonies/superhero
...
Massive Superhero Update
2015-05-06 23:40:08 -04:00
ZomgPonies
31fc0d39a5
Final touches on superheroes
2015-05-06 23:26:33 -04:00
ZomgPonies
3503c285fa
Add toolbelt with smokebombs and bolas to owlman
2015-05-05 20:48:27 -04:00
Fox-McCloud
cbb2b819fd
Enables Bag Item Stacking
2015-05-05 17:29:03 -04:00
Fox-McCloud
5aada8a9a3
Merge pull request #906 from Krausus/NicotineAddiction
...
Cigarette Fixes/Tweaks
2015-05-02 23:29:49 -04:00
Krausus
c000cb4c78
Doubles cigar(ette) capacity, tweaks base nicotine
2015-05-02 23:08:17 -04:00
Krausus
73983dc433
Fixes putting cigars and pipes into cigarette packs
2015-05-01 04:28:18 -04:00
Krausus
e5f0d0bb6a
Changes nicotine pre-generation and fixes lacing
2015-05-01 01:41:19 -04: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
b8230aefe6
Nukies--Chemsprayer and New Grenades
2015-04-08 23:39:07 -04: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
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
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
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
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
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
Tigercat2000
9a19420ac3
Fix spelling error
2015-03-22 15:39:25 +01:00
Tigercat2000
c40c37390f
Allow Chaplain to bless beakers by inserting them into his bible
2015-03-22 15:29:37 +01:00
ZomgPonies
8baa1e4ba9
Merge pull request #595 from Fox-McCloud/Bible-Farting
...
Proper Bible Farting
2015-03-19 01:42:19 -04:00
Fox-McCloud
ba98e33b66
Proper Bible Farting
2015-03-17 19:40:46 -04:00
Markolie
cacc2bf917
Fixes
2015-03-16 18:49:47 +01:00
Markolie
80a560d291
Never mind the ArtVend, mapfix, compile fix, rename plastique --> C4
2015-03-08 19:05:36 +01:00
Markolie
b8b0fd13b8
Artvend, merge branch 'master' of https://github.com/ParadiseSS13/Paradise
...
Conflicts:
code/game/response_team.dm
maps/cyberiad.dmm
2015-03-08 18:54:13 +01:00
Fox-McCloud
4e4e7ae77f
Crayons and Gloves
2015-03-06 21:40:57 -05:00
Markolie
9cbb93777e
ERT armory rework
2015-03-04 19:06:22 +01:00
Markolie
4fb7a95cff
ERT equipment update
2015-03-04 17:16:19 +01:00
Markolie
4ac1007d82
ERT equipment rework
2015-03-03 22:51:54 +01:00
DZD
69eb5509ec
Fixes exchange document objective
2015-03-01 20:35:09 -05:00
ZomgPonies
5a94b87331
Merge pull request #457 from Fox-McCloud/Cameras
...
Camera Update+Camera Bugs
2015-03-01 12:28:58 -05:00
Fox-McCloud
62462c876f
Camera Update+Camera Bugs
2015-02-28 04:01:14 -05:00