Crazylemon64
1840074921
Refactors "organs" to be "bodyparts" to end confusion once and for all
2017-04-29 23:23:09 -07:00
scrubmcnoob
20c4384828
Merge remote-tracking branch 'refs/remotes/ParadiseSS13/master'
2017-04-29 19:42:10 -04:00
Crazy Lemon
ff271f7b29
Merge pull request #7061 from Fox-McCloud/damn-cells
...
Damn cells
2017-04-09 13:55:30 -07:00
Fox-McCloud
5631d36ff8
Converts Most Destroys to use QDEL_NULL
2017-04-04 23:08:41 -04:00
Fox-McCloud
183702a36e
fix up 2.0
2017-04-02 00:38:14 -04:00
Fox-McCloud
35ab7ada94
Refactors Cell Energy Values
2017-04-01 20:14:29 -04:00
Crazy Lemon
9c233a676d
Merge pull request #6865 from Fox-McCloud/receiverssss
...
Adds Modular Receivers to Loot Table and Hacked Autolathes
2017-03-30 18:32:32 -07:00
Ronald T. Mullins III
828ad8eea6
Fixes #6993
...
The typo is actually "Incindiary" not "Incinidary". :3
Should this be done in a bigger Fixes PR? I just thought that I had free time and saw this sooo...
2017-03-29 20:26:55 -05:00
Fox-McCloud
182dcd93b5
autolathe receivers
2017-03-24 16:57:25 -04:00
Kyep
39e241bd3a
Disconnects Prison, Adds Pulse Turrets
2017-03-12 00:25:18 -08:00
Crazy Lemon
a5f594ce37
Merge pull request #6689 from Fox-McCloud/nerf-shotguns
...
Nerfs Buckshot
2017-03-11 15:26:58 -08:00
Markolie
3aa1399995
Implement usesound/toolspeed
2017-03-07 16:46:28 +01:00
Fox-McCloud
0e48b1d3df
Nerfs Buckshot
2017-03-04 20:58:35 -05:00
Markolie
c5b897a951
Fix fax machine logout issue, fix card eject telekinesis interaction, fix death alarm follow link, fix flavor text not hiding when unknown, fix spacepod mining lasers
2017-02-22 18:24:43 +01:00
Fox McCloud
cff15468ba
Merge pull request #6478 from FlattestGuitar/lasers
...
New laser carbine icons
2017-02-18 11:07:56 -05:00
Mieszko Jędrzejczak
e8a04e5524
Laser carbine icons!
2017-02-17 14:21:48 +01:00
Krausus
4754d6b4b3
Fixes some sounds not being cached properly
2017-02-17 02:37:26 -05:00
Markolie
56dd8b189e
Proper fix for minebot damage issue
2017-02-15 17:23:57 +01:00
Markolie
519749cf8d
Fix OP minebots, move them into a separate file
2017-02-15 16:21:04 +01:00
Markolie
924e539f22
Chassis mods now rename KA, remove cost from chassis mods/tracer mods
2017-02-08 19:27:16 +01:00
Markolie
3298f7edce
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_updates
...
# Conflicts:
# icons/obj/objects.dmi
2017-02-08 19:25:47 +01:00
Markolie
053ff0fbbb
KA energy adjustments
2017-02-08 03:03:45 +01:00
Markolie
0790ed5f8d
KA fixes, upgrade typo fix
2017-02-08 02:45:13 +01:00
Markolie
835f68843a
Minor fixes, prevent ABSTRACT items from being summoned
2017-02-07 23:54:50 +01:00
Fox-McCloud
ad2468196e
On Varedit Fixes
2017-02-07 08:44:50 -05:00
Markolie
96bd88badb
Fix action item message
2017-02-06 20:50:31 +01:00
Markolie
7a4c33bbcd
Add meat hook, warp cube, wisp lantern, rename flashlight variable on weapons, add layer/inventory definitions
2017-02-06 19:55:37 +01:00
Markolie
2a23862c6a
Kinetic accelerator update, other fixes
2017-02-06 18:39:03 +01:00
Fox-McCloud
390f6768b3
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-02-05 05:26:46 -05:00
Markolie
2b767bb9c9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/mob_helpers.dm
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/storage.dmi
2017-01-31 17:44:38 +01:00
Fox McCloud
0283e75fe5
Merge pull request #6254 from FlattestGuitar/erifle
...
Adds a laser carbine!
2017-01-31 00:43:15 -05:00
Markolie
1d7de41acb
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/pooling/pool.dm
2017-01-27 17:28:14 +01:00
Fox-McCloud
51bbe8c466
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-26 06:53:18 -05:00
Crazy Lemon
0959e819ec
Merge pull request #6237 from Fox-McCloud/no-pooling
...
Fires all Lifeguards, Bans Diving, and Forbids Swimming...
2017-01-26 03:48:35 -08:00
Crazy Lemon
0e42e416b6
Merge pull request #6176 from Fox-McCloud/reagents-noreact-refactor
...
Makes Reagents Holder Process and Refactors NOREACT
2017-01-26 03:47:30 -08:00
FlattestGuitar
692f2d238b
Adds a laser carbine!
...
Admin only for now.
2017-01-26 12:45:36 +01:00
Fox-McCloud
d0b378892d
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 22:25:00 -05:00
Markolie
a7205cfd3e
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# icons/obj/ammo.dmi
# icons/obj/guns/projectile.dmi
# icons/obj/projectiles.dmi
2017-01-23 17:36:37 +01:00
Fox McCloud
2af1f9bb79
Merge pull request #6185 from Allfd/Enforcer
...
Ports Enforcer handgun, rubber bullets, and new shotgun ammo boxes from Stratus
2017-01-23 06:08:36 -05:00
Fox-McCloud
ea15a83fde
Fires all Lifeguards, Bans Diving, Forbids Swimming, and Restricts Water Useage
2017-01-23 01:56:47 -05:00
Fox-McCloud
7007f6bbdf
Merge remote-tracking branch 'upstream/master' into botany-rework
2017-01-23 01:01:09 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
Markolie
a50a3d59b9
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/__DEFINES/is_helpers.dm
# code/_globalvars/lists/objects.dm
# code/game/machinery/turrets.dm
# config/example/config.txt
# goon/browserassets/css/browserOutput.css
# icons/obj/library.dmi
# icons/turf/floors.dmi
2017-01-20 23:43:35 +01:00
Mieszko Jędrzejczak
1b506aaf9f
Switches over to the new system
2017-01-17 13:57:07 +01:00
Alffd
a6b916fc92
Makes the description generic.
2017-01-16 00:14:30 -05:00
Alffd
3fbc81cea7
Ports Enforcer handgun, rubber bullets, and new ammoboxes.
2017-01-15 21:13:22 -05:00
Fox-McCloud
ea8080e6c9
Makes Reagents Holder Process and Refactors NOREACT
2017-01-14 20:09:49 -05:00
Markolie
f85e8fe551
Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into lavaland_megafauna
...
# Conflicts:
# code/modules/mob/living/carbon/human/species/station.dm
# icons/mob/screen_alert.dmi
2017-01-11 23:11:29 +01:00
Crazy Lemon
f1c3a7cd13
Merge pull request #6085 from Fox-McCloud/food-rework
...
Food rework
2017-01-10 12:11:17 -08:00
Crazy Lemon
3961aa3bcd
Merge pull request #6074 from TullyBurnalot/Splatterdash
...
Wand of Death Reliable Killing
2017-01-10 00:27:23 -08:00
