ZomgPonies
d31a39256e
2nd mining overhaul commit. Fun KEPT.
2014-06-15 07:45:27 -04:00
Zuhayr and ZomgPonies
ef59deb928
First pass on ore distribution map and stationary drilling rig.
...
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/modules/mining/coins.dm
code/modules/mining/machine_processing.dm
code/modules/mining/machine_stacking.dm
code/modules/mining/minerals.dm
code/modules/mining/satchel_ore_boxdm.dm
2014-06-15 07:35:17 -04:00
ZomgPonies
692e7ef435
Fixing biting your own hand off
2014-06-14 23:18:12 -04:00
Loganbacca and ZomgPonies
083cd19c6a
New vehicle framework
...
- Implements a new vehicle framework
- Adds cargo trains
Conflicts:
code/modules/mob/living/carbon/human/human.dm
2014-06-14 22:14:53 -04:00
Zuhayr and ZomgPonies
f219643f96
Fixes #5195
2014-06-14 22:02:35 -04:00
ZomgPonies
386b1b8307
Fixes a bunch more hurt -> harm checks
2014-06-14 01:02:29 -04:00
ZomgPonies
fb5265d1b1
You forgot 2 commas, NOW I'm annoyed :D
2014-06-09 01:23:12 -04:00
ZomgPonies
d1f2f9c361
Merge pull request #246 from BobTheBoss64/master
...
Added volume to Zippo lighters.
2014-06-09 01:09:24 -04:00
Michael Slettevold
0a1b0af8f7
Fixed lack of Zippo volume
2014-06-08 20:20:56 -07:00
Michael Slettevold
47ec7fc3f1
Fixed lack of Zippo volume
2014-06-08 20:19:33 -07:00
Michael Slettevold
a30cd63810
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 20:14:33 -07:00
ZomgPonies
32e0776b2d
Merge pull request #245 from BobTheBoss64/master
...
Zippo sound effects and spelling fixes
2014-06-08 21:56:17 -04:00
Erthilo and ZomgPonies
ee56d75f52
Bandage Typos.
2014-06-08 17:38:06 -04:00
Michael Slettevold
57eed9777c
Added sound effect for opening and closing Zippo lighters.
...
Corrected spelling of "independent", for flagprocs.dm.
2014-06-08 14:17:37 -07:00
ZomgPonies
0d57c3ef4d
Tune bag choking
2014-06-06 00:06:17 -04:00
ZomgPonies
4683a12a35
Fix for storage bags
2014-06-05 22:17:01 -04:00
ZomgPonies
caaf56dbcc
Bugfix for bag choking
2014-06-05 17:09:27 -04:00
Rob Nelson and ZomgPonies
5649e2c34d
Optimize the fuck out of using checks in machines.
2014-06-05 16:16:27 -04:00
ZomgPonies
b9fe3ab514
Added choking people with plastic bags.
2014-06-05 04:43:30 -04:00
mwerezak and ZomgPonies
0ed8ee9b19
Readds flashes to all robots except drones.
...
Drones also get a special low-power flashlight, now.
2014-06-03 19:22:47 -04:00
Hubblenaut and ZomgPonies
70d96aedde
Makes crashing into things possible with extinguisher or harm intent
2014-06-03 18:46:52 -04:00
Zuhayr and ZomgPonies
31a1b6e526
Fixes #5098
...
Conflicts:
code/game/objects/items/weapons/tools.dm
code/modules/power/cable.dm
2014-06-01 13:29:18 -04:00
alex-gh
1dba2dd59d
Merge pull request #235 from alex-gh/uplink_greentext
...
TC use count appears on round end
2014-05-30 20:30:05 +02:00
ChuckTheSheep and alex-gh
7491cd7b65
TC use count appears on round end
...
Conflicts:
code/datums/uplink_item.dm
code/game/objects/items/devices/uplinks.dm
Adds Icons and purchase list
Conflicts:
code/datums/uplink_item.dm
code/game/gamemodes/traitor/traitor.dm
code/stylesheet.dm
CSS is hard
Conflicts:
code/game/gamemodes/traitor/traitor.dm
Mah Indents
Made Purchase Log Text rather than List
Conflicts:
code/game/objects/items/devices/uplinks.dm
Moved images to top "survived" line
Conflicts:
code/game/objects/items/devices/uplinks.dm
Boxes show contents
Nuke Ops Group Shaming
Conflicts:
code/game/gamemodes/nuclear/nuclear.dm
Uses compiled list for uplinks
Conflicts:
code/game/objects/items/devices/uplinks.dm
2014-05-30 20:28:35 +02:00
d3athrow and ZomgPonies
d7b67f6b16
This wasn't needed apparently.
2014-05-28 08:45:44 -04:00
ZomgPonies
06bbfcf150
Final Nations patch before live testing. This is going to be painful.
2014-05-27 20:09:10 -04:00
d3athrow and ZomgPonies
c50eb1217b
Tested and Fixed #826
...
Conflicts:
code/game/objects/items/stacks/stack.dm
2014-05-27 14:21:57 -04:00
ZomgPonies
9bf41d3405
4th Nations commit, Finished framework. Rest of gameplay code is within the flag object's attackby and dropped procs.
2014-05-27 01:20:20 -04:00
ZomgPonies
3c9dbcc822
First commit for nations gamemode, setting up the framework I'll be using.
2014-05-26 20:02:20 -04:00
ZomgPonies
581376e191
Nuke ops fixes
2014-05-26 17:57:39 -04:00
ZomgPonies
f36e5d206c
Fix secborg tasers
2014-05-26 16:29:03 -04:00
Zuhayr and ZomgPonies
f97f7cedcc
Lots of work on hardsuits, commented out some broken WIP code, did some renaming, deleted now-redundant species-specific hardsuits.
...
Conflicts:
code/game/machinery/suit_storage_unit.dm
code/game/objects/items.dm
code/game/objects/items/devices/modkit.dm
code/modules/clothing/masks/breath.dm
code/modules/clothing/spacesuits/alien.dm
code/modules/clothing/spacesuits/rig.dm
2014-05-26 13:58:17 -04:00
mwerezak and ZomgPonies
516bed9ddd
Fixes bodybags not being able to be put back...
...
...into their own box. Also affects folded cryobags.
2014-05-26 06:21:43 -04:00
ZomgPonies
f6a9016f34
Unathi flag in, waiting on spears and burning in-hands for the remaining flags.
2014-05-25 22:14:54 -04:00
ZomgPonies
aa4f29c5e8
Only one flag to go!
2014-05-25 21:34:25 -04:00
ZomgPonies
1c02329ef4
Machine people/synthetics flag
2014-05-25 18:54:37 -04:00
ZomgPonies
f184c8fd5c
On-fire in-hand for all current flags
2014-05-25 16:57:59 -04:00
ZomgPonies
f3d04ab657
You can now set flags on fire -- in-hands on fire missing
2014-05-25 15:39:12 -04:00
ZomgPonies
aab6cb2430
Adds Vox and Pony flags
2014-05-25 11:50:08 -04:00
ZomgPonies
dae3e2d5e8
Adds Skrell and Ninja flags
2014-05-25 05:36:12 -04:00
ZomgPonies
7bbac52dc8
Moar flags
2014-05-25 03:03:16 -04:00
ZomgPonies
11a1deb1ac
Trying to cut down on attack lock spam
2014-05-24 17:17:38 -04:00
ZomgPonies
497a113bf3
Atmosia flag! All departments are covered...now to code nations gamemode.
2014-05-24 14:32:51 -04:00
ZomgPonies
55de2b38a7
Wizard flag
2014-05-24 13:09:10 -04:00
ZomgPonies
08b69878f7
Only atmosia flag left to do!
2014-05-24 12:27:55 -04:00
ZomgPonies
463537e9a2
Bunch of new flags.
2014-05-24 11:38:32 -04:00
ZomgPonies
029ce0b1ca
Syndi flag + more flag organizing.
2014-05-24 10:56:48 -04:00
ZomgPonies
162b936bd3
Fixed up in-hands and flags and shit jesus fucking BYOND christ
2014-05-24 10:40:38 -04:00
ZomgPonies
e1ce0ee664
Errr
2014-05-24 09:15:26 -04:00
ZomgPonies
b4f5df6d1d
Made flags unable to fit in backpacks.
2014-05-24 09:11:27 -04:00
ZomgPonies