544c39f7c2
salvage
...
Conflicts:
code/game/jobs/access.dm
code/game/objects/items/weapons/cards_ids.dm
maps/tgstation.2.1.0.0.1.dmm
2014-02-16 10:38:52 -05:00
917370a608
Jay Owen demands that this pull be merged.
...
Crush a can for Jay Owen.
He has leukemia, please crush a can for Jay Owen.
His only wish is to see a can crushed live in our game.
Sprites by Nienhaus
Conflicts:
code/game/objects/items/trash.dm
code/modules/reagents/reagent_containers/food/drinks.dm
icons/obj/janitor.dmi
2014-02-16 05:42:55 -05:00
71c07e208a
Improved creature AI and random mob spawning in caves.
...
Also equipment lockers.
Conflicts:
code/game/objects/items/weapons/cards_ids.dm
code/modules/mining/materials.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/ores_coins.dm
code/modules/mob/living/simple_animal/hostile/mining_mobs.dm
code/modules/projectiles/ammunition/bullets.dm
code/modules/projectiles/guns/energy/special.dm
compare_report_tg.txt
icons/obj/device.dmi
icons/obj/mining.dmi
icons/obj/vehicles.dmi
maps/tgstation.2.1.0.0.1.dmm
maps/vgstation1.0.0.dmm
2014-02-16 04:40:18 -05:00
6ad3ca77f1
New stuff for mining
...
Conflicts:
code/game/mining_surprise.dm
code/game/objects/structures/wizmobile.dm
code/modules/mining/mine_turfs.dm
code/modules/mining/minerals.dm
compare_report_tg.txt
icons/obj/mining.dmi
icons/turf/walls.dmi
2014-02-16 03:54:39 -05:00
60abc446db
Merge pull request #158 from SamCroswell/master
...
/TG/ Card Port
2014-02-15 12:39:49 -05:00
7a54bb3b24
Merge pull request #159 from alex-gh/fireex_nerf
...
Nerfed firing items from fire extinguishers, they now do double the dama...
2014-02-15 12:39:41 -05:00
9aaf0b8a5c
fixed unfinished merge
2014-02-14 14:22:39 +01:00
4776dfd94f
Telebaton now only stuns if it actually hits.
2014-02-14 14:13:03 +01:00
85b59532fe
using a welder with already damaged eyes no longer causes you to go blind
...
Conflicts:
code/game/objects/items/weapons/tools.dm
2014-02-14 13:48:46 +01:00
0f57ef70ca
Nerfed firing items from fire extinguishers, they now do double the damage compared to throwing them normally
2014-02-14 13:22:34 +01:00
ca75160d6a
People in lobby won't see PDA messages.
2014-02-14 11:54:32 +01:00
3634ff942b
/TG/ Cards Ported, new card deck added
2014-02-11 23:22:30 -05:00
4ae2cd974b
Ghosts can see PDA messages. (Redo: PR #4065 lost in merge)
2014-02-11 03:00:04 -05:00
be3c95a9ff
Changes 'n shit
2014-02-07 18:43:48 -05:00
bd26d1b0b7
Various Pulse Rifle Fixes
2014-02-06 23:10:02 -05:00
00f830cc2a
Remove radio debugging.
2014-02-05 22:51:03 -05:00
c69ddf76ec
Reintroducing the dough-based cooking system.
...
Conflicts:
code/modules/food/recipes_microwave.dm
code/modules/reagents/reagent_containers/food/snacks.dm
icons/obj/food.dmi
2014-02-01 19:22:22 -05:00
05149946d6
Remove borken RPD
2014-02-01 04:30:17 -05:00
7a99402138
Compile fix
2014-01-31 03:19:42 -05:00
c72e625e53
Returned to the forces of light thanks to gia
...
No more text paths, only normal paths
2014-01-31 02:56:40 -05:00
5c8d9ede3b
Added chem handling and IED recipe
...
Uh oh
Conflicts:
code/game/atoms.dm
code/game/objects/items/weapons/stunbaton.dm
code/game/objects/structures/tables_racks.dm
2014-01-31 02:56:27 -05:00
17151cd7b2
Some recipes and addable parts
...
Indeed
2014-01-31 02:51:57 -05:00
58cb6a147a
Return to the text paths
...
Yes byond doesnt let me use normal paths as association for numbers
2014-01-31 02:51:36 -05:00
88ee7313b5
Merge pull request #139 from SamCroswell/master
...
Additional Select Equiptment Option, More Areas
2014-01-30 23:46:47 -08:00
c3b021e246
Added a garbage collector implementation based on rumors from Goon and proc references in released gooncode.
...
And holy shit it's fast
Conflicts:
baystation12.dme
code/ATMOSPHERICS/pipes.dm
code/game/machinery/Sleeper.dm
code/game/machinery/rechargestation.dm
code/game/objects/structures/crates_lockers/crates.dm
code/game/objects/structures/tables_racks.dm
code/modules/mining/mine_turfs.dm
code/modules/paperwork/photocopier.dm
code/modules/power/cable.dm
html/changelog.html
2014-01-29 23:45:21 -05:00
12ffdb84bd
PDA icon fixes, various fixes to select equipt
2014-01-29 17:24:51 -05:00
6dfa08040c
Merge pull request #131 from SamCroswell/master
...
More C4 suicide phrases. For no Raisin.
2014-01-28 20:15:26 -08:00
8c5ad54e0f
Recommitting a ton of files as one commit due to needing to reset this repo to an earlier point in the log. Full changes in PR.
...
Conflicts:
code/game/objects/items/weapons/implants/implant.dm
code/modules/admin/verbs/vox_raiders.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/diona.dm
code/modules/mob/living/carbon/species.dm
2014-01-28 15:30:20 -05:00
559700a58b
Added a bunch of new goon powers.
...
Conflicts:
code/modules/mob/living/carbon/human/emote.dm
2014-01-26 14:48:33 -05:00
beea722e60
More C4 suicide phrases. For no Raisin.
2014-01-26 14:45:16 -05:00
f084d49d24
Compile fixes
2014-01-25 12:40:47 -05:00
2e5fc8a4fc
Revert "Display cases now constructable."
...
This reverts commit 3e210aa75c
2014-01-25 12:29:29 -05:00
22f6bb90be
Add additional extinguisher logging, transfer logging framework.
...
Conflicts:
code/game/objects/items/weapons/extinguisher.dm
2014-01-25 12:29:21 -05:00
58275e6ddc
Fuck you emisune
2014-01-25 12:27:07 -05:00
253035f935
Fixes #452 , people who are silenced for whatever reason or miming can't use the megaphone
2014-01-25 12:26:54 -05:00
3e210aa75c
Display cases now constructable.
...
* Make machine frame
* Add glass (do not wire)
* Add airlock controller board (set perms first)
* Screwdriver
Disassemble by crowbarring when unlocked or broken.
Conflicts:
get_dmi_header.bat
html/changelog.html
icons/obj/stock_parts.dmi
2014-01-24 21:42:33 -05:00
dd7f48c470
More typo.
2014-01-24 12:24:35 -05:00
e3a2a9238d
Fix typo before someone notices.
2014-01-24 12:24:14 -05:00
47e8c640a2
New display case code
2014-01-24 12:23:26 -05:00
341d210c99
Fix some issues with the radio, like talking on common when calling for command.
2014-01-24 12:04:52 -05:00
d01ef41eac
Radio code in say.dm cleaned up, will use all possible radios when sending a message.
...
Conflicts:
code/modules/mob/living/say.dm
2014-01-23 23:48:46 -05:00
f1c80be06f
Merge pull request #127 from SamCroswell/master
...
Tweaks 'n shit
2014-01-23 20:34:50 -08:00
7ad68dd693
Replaced wall_smash in simple_animal with environment_smash, because before, you either tables AND walls, or nothing. If set to 1, smash crate/locker/rack/table, 2 for wallsmash, 3 for rwall smash
...
Hostile mobs with environment smash will also unbuckle themselves by destroying whatever they're buckled to when angered.
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/bed.dm
code/game/objects/structures/tables_racks.dm
code/game/turfs/simulated/walls.dm
code/modules/mob/living/simple_animal/hostile/hostile.dm
2014-01-23 23:31:36 -05:00
d4890fb2f5
Additional Drug Names
2014-01-23 19:26:32 -05:00
f59fa5474e
Contraband Crate Changes, Minor Drug Tweaks
...
More little tweaks to the random drugs, added actual contraband to the
contraband crate. Maybe people will have a reason to buy it now, eh?
2014-01-23 18:01:41 -05:00
6478e2e1d7
silent is broken as fuck
...
Removes the message that checks if a mob is silent; silent is just plain broken.
2014-01-23 10:34:41 -05:00
f54a35db72
Prevents mimes from using the megaphone.
...
if(user.silent) didn't work. This is the next best thing.
2014-01-23 10:34:03 -05:00
a3a883444c
Last minute tweaks
2014-01-22 23:12:50 -05:00
fc4877b301
Added a few more drug names
2014-01-22 22:55:19 -05:00
86ad8a5a17
Drugs/Minor CentComm Updates
2014-01-22 22:26:01 -05:00
Lokiamis