VampyrBytes
cfef299686
Genetics fixes
...
Fixes issue with getting target in remote talk, remote view and empath
Fixes Empath not recharging
Fixes inability to cancel remote view
Fixes Grays not starting with remote talk
2014-08-16 11:51:17 +01:00
Jeremy Liberman
a4196cb745
Add Vox Heist directive and call shuttle on completion of Directive X
...
Conflicts:
baystation12.dme
code/controllers/emergency_shuttle_controller.dm
code/modules/mob/mob.dm
2014-08-06 23:12:24 +02:00
JimTheCactus
ba3241fadf
Merged getFlatIcon rendering from tgstation
...
Based on tgstation #2826 . This is not all of it though.
2014-07-31 17:03:05 -04:00
SamCroswell
94dbad82a4
Alien Tweaks, Commented Out Detomatix
2014-07-30 00:53:56 -04:00
Zuhayr
a7ffa5747b
Fixed diona pods being mutable, fixed a few other tweaks, added cuttings.
2014-07-29 14:44:15 -04:00
ZomgPonies
b33df4745c
Removed deprecated power generation stuff (AM, RUST) to free up more procs
2014-07-25 11:33:37 -04:00
Zuhayr
ebb9f724aa
Hydroponics rewrite, details will be in PR. Big commit.
...
Conflicts:
baystation12.dme
code/controllers/master_controller.dm
code/game/gamemodes/events/spacevines.dm
code/game/machinery/seed_extractor.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/mob.dm
code/modules/reagents/Chemistry-Reagents.dm
code/modules/reagents/reagent_containers/food/snacks/grown.dm
icons/obj/hydroponics.dmi
maps/tgstation2.dmm
2014-07-25 11:10:01 -04:00
Loganbacca
0e9e9fe596
Cargo train update
...
- Adds sprites (thanks to Bishop)
- Adds order-able train cargo crates
Conflicts:
code/datums/supplypacks.dm
code/modules/vehicles/cargo_train.dm
icons/obj/vehicles.dmi
2014-07-24 18:43:13 -04:00
PsiOmega
df59d8cbc7
Makes it possible for the AI to alt+left click turfs in camera view and grants ctrl/alt shortcuts to the turret control.
...
AI can now alt+left click turfs in camera view to list and interact with objects in the status tab. For example allows for interacting with emergency shutters beneath grills.
alt-clicking doors now notifies the AI when they are electrified/un-electrified as, unlike most other shortcuts, this doesn't have a visual cue.
When interacting with doors and the AI-control is disabled hacking is now automatically initiated, as if the AI had attempted to open the door 'menu'.
When borgs/AIs try to interact with an emagged door they now receive a feedback message that it's unresponsive.
Parts of implementation done by porting code from tg-station.
Conflicts:
code/_onclick/ai.dm
code/_onclick/click.dm
code/modules/mob/living/silicon/ai/freelook/cameranet.dm
code/modules/mob/mob.dm
2014-07-23 14:55:03 -04:00
ZomgPonies
431ab486b3
Made all current wizard + genetic spells a subtype of spell/wizard (Since they use the same action button row)
2014-07-23 11:04:07 -04:00
ZomgPonies
800d5b4b0b
Revert "Made wizard spells into various subtypes"
...
This reverts commit 8b703f55af
2014-07-23 10:58:20 -04:00
ZomgPonies
8b703f55af
Made wizard spells into various subtypes
2014-07-21 09:40:42 -04:00
ZomgPonies
4e1d24609f
Fireball explosion fixes
2014-07-20 04:31:32 -04:00
ZomgPonies
8bf4fc4418
More faction stuff for wizards
2014-07-20 03:52:40 -04:00
ZomgPonies
dd720d4bfb
No more magic missiling fellow wizards or your apprentice.
2014-07-20 03:39:03 -04:00
ZomgPonies
60b0659d43
Made update_power be at mob level since spells are at that level.
2014-07-18 12:11:13 -04:00
ZomgPonies
b2b869a57d
Added remote view to spelllist
2014-07-18 05:09:17 -04:00
ZomgPonies
4ad8b741a2
Turned remote talk into a spell and optimized it, giving it it's action button
2014-07-18 02:38:53 -04:00
ZomgPonies
ad24b4f653
Remaining spell icons
2014-07-16 17:01:46 -04:00
ZomgPonies
e77ebbb15a
Moar spell icons
2014-07-16 08:58:22 -04:00
ZomgPonies
5bd725af44
More work on spell action buttons.
2014-07-16 02:48:54 -04:00
ZomgPonies
2d31bfa01d
Removing disease1/virus1 from repo
2014-07-16 02:00:32 -04:00
ZomgPonies
aafa11712a
Removal of virus1/disease1 system. So long GBS/Jungle Fever, you'll be missed!
2014-07-16 00:53:08 -04:00
ZomgPonies
ccb425bd44
Preperation for spell action buttons
2014-07-15 11:20:43 -04:00
ZomgPonies
1eb02b5cf4
Overhauled holsters and webbings
2014-07-15 04:02:24 -04:00
Hubblenaut
3345e0fede
Fixes teleporting while buckled
2014-07-13 06:47:28 -04:00
Necaladun
ac95fb3c37
revert ducky crate
...
was replacing pizzas with this, and don't have the time atm to figure it
all out so revert
2014-07-01 08:40:40 +09:30
ZomgPonies
1bab93f920
Fix serverstart crafting controller runtimes.
2014-06-29 16:44:51 -04:00
ZomgPonies
399e4909d6
The death of assistants. Long live civilians!
2014-06-27 17:57:18 -04:00
Necaladun
c18e3cfc80
Various minor
...
Drug dealer changed to pharmacologist to avoid breaking bad wannabes.
NGS - NCS Cyberiad
Rubby Duck Crates
2014-06-26 23:48:14 +09:30
DJSnapshot
54b2e5f7a7
Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.
...
Conflicts:
code/datums/browser.dm
html/browser/common.css
2014-06-23 06:16:29 -04:00
DJSnapshot
8a33620554
Initial commit of Computer 3 from Paradise, along with a bunch of fixes.
...
Conflicts:
code/__HELPERS/unsorted.dm
code/datums/browser.dm
code/setup.dm
icons/obj/computer3.dmi
2014-06-23 06:02:36 -04:00
ZomgPonies
fea9d8eda3
Switched verbs around, removed Fun tab, new Event tab for event coordinators
2014-06-21 04:37:50 -04:00
mwerezak
264595d178
Fixes tails not rendering in record photos
2014-06-18 22:17:05 -04:00
ZomgPonies
37e975fcc8
Merge pull request #261 from Bone-White/master
...
Pickpocket Gloves fix
2014-06-18 06:34:37 -04:00
Bone White
89b8a002bf
Pickpocket Gloves fix
...
They can now take/place ids without notifying, and ids enter the
pickpocket's hand instead of dropping to the floor or not working.
2014-06-18 11:04:33 +01:00
ZomgPonies
86a4274a3f
add_logs runtime fix
2014-06-17 04:19:41 -04:00
ZomgPonies
c5e6f8c070
Runtime fix logging electrifying airlocks
2014-06-17 00:14:04 -04:00
mwerezak
e9171a9ae3
Adds docking support to shuttles, NanoUI
...
Conflicts:
code/game/machinery/doors/airlock.dm
code/game/machinery/doors/airlock_control.dm
code/game/machinery/embedded_controller/docking_program.dm
code/modules/shuttles/shuttle.dm
nano/css/shared.css
2014-06-14 04:10:39 -04:00
ZomgPonies
866c84a3d3
Moar addiction fixes
2014-06-09 17:51:05 -04:00
ZomgPonies
2c57ec96ae
First commit of the addiction system
2014-06-08 21:55:03 -04:00
Zuhayr
31a1b6e526
Fixes #5098
...
Conflicts:
code/game/objects/items/weapons/tools.dm
code/modules/power/cable.dm
2014-06-01 13:29:18 -04:00
Zuhayr
777e31e222
Fixes #4973
...
Conflicts:
code/datums/spells/ethereal_jaunt.dm
2014-06-01 13:26:20 -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
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
ZomgPonies
c470beb5c9
New recipes
2014-05-30 14:27:58 -04:00
ZomgPonies
06bbfcf150
Final Nations patch before live testing. This is going to be painful.
2014-05-27 20:09:10 -04:00
ZomgPonies
9d45361f9b
3rd nations commit, moved nations to datums to make things easier down the line.
2014-05-27 00:20:39 -04:00
mwerezak
cb5ffe6d2c
Forgot to add VV menu entry for give_disease2
2014-05-26 06:12:21 -04:00
Walter0o
198b4863b6
fixed crafting_master hook
...
when world.dm got changed from calling the setup procs itself to using hooks,
crafting was overlooked.
why are all commits not tested beforehand in a dev branch ?
2014-05-25 18:23:48 +02:00
