Commit Graph

417 Commits

Author SHA1 Message Date
PsiOmega
924955a4c8 Merge remote-tracking branch 'upstream/master' into dev-freeze 2014-12-09 09:07:38 +01:00
Segrain
a311da90fb Fix for #7330. 2014-12-09 07:39:38 +03:00
Mloc-Argent
117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega
5b8942543b Merge remote-tracking branch 'upstream/dev' into RoboCircuit 2014-11-27 08:58:34 +01:00
PsiOmega
c14411d979 Robots can now be rebuilt after destruction.
Robotic borgs now have a circuit which can be re-installed in a new chassi after the destruction of the original.
2014-11-27 08:58:29 +01:00
GinjaNinja32
48343a23fb Fix most nullspace items, rewrite floor tiles not to del() on every place/remove 2014-11-24 17:05:46 +00:00
Zuhayr
c8e8e663f9 Merge resolution. 2014-11-22 07:31:44 +10:30
Hubblenaut
aeda763e81 MedicalHUD takes hardcrit in account 2014-11-20 18:42:17 +01:00
Zuhayr
4d64a11acd Manual merge of head.dmi. 2014-11-14 23:02:16 +10:30
Zuhayr
ebbb9b36b5 Moved everything to a module-based hardsuit system.
Generalized all ninja power and gear code to work with new rig system.
Added shurikens, weapon mount, more work on deployable items.
Readded energy nets and energy blades.
Grenade launcher/charge stuff, interface stuff.
Renamed previously existing rigs to voidsuits, restructured rig and voidsuit files.
Refactored the energy net and teleportation proc.
Totally rewrote AI core/intellicard transfer procs.
Added rig sprites by Mordeth221, added step by steap suit sealing/inability to interfere with suit sealing process.
Updated map paths to use voidsuits.
Added chemical dispenser functionality, added power sink, added atom/drain_power() proc for later use.
Added rigsuit verbs, added voice changer.
Renamed MASKINTERNALS to AIRTIGHT, added internals checks for airtight helmets.
Added drain_power() procs to vulnerable machinery.
Reimplemented data theft.
Added suit maluses for losing your cell while wearing one.
Transitioned the rig suits to a back-mounted item that also controls a chestpiece.
Converted rig module to a storage item, convert ERT voidsuits to hardsuits.
2014-11-14 22:57:26 +10:30
Zuhayr
31b6cc19ad Fixed up weird sound-playing by simple animals, changed all simple animal attack strings to past tense so they gel with other harm intent actions. Readded simple_animal eating food, tested everything. 2014-11-13 21:41:02 +10:30
Zuhayr
4bb4145f5d Readded interactions for slimes and monkeys using attack_generic proc. 2014-11-13 19:18:34 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
Zuhayr
b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
Chinsky
52cd8649f6 Merge pull request #6949 from PsiOmegaDelta/Runtime
Fixes server start runtime errors
2014-11-07 03:45:52 +03:00
Chinsky
8078ffe079 Merge pull request #6939 from PsiOmegaDelta/VerbOptimization
Verb optimization
2014-11-05 23:23:56 +03:00
PsiOmega
a216173271 Fixes server start runtime errors
Moves mech Z-level checks from New() to initialize() to ensure configuration has been read.
2014-11-05 13:18:35 +01:00
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Chinsky
e8b8c7ab55 Merge pull request #6931 from PsiOmegaDelta/MoreZ
More Z-level compatibility
2014-11-05 09:21:52 +03:00
PsiOmega
fc67087d7a More Z-level compatibility
Previously missed Z-level checks in the form "z  != X".  Utilized this regex which hopefully has cought most of them [zZ](\s?)(!?)=(\s?)(\d+).
Adds more Z-level configuration, admin levels.
2014-11-03 09:57:56 +01:00
mwerezak
5372b526a1 Merge remote-tracking branch 'upstream/dev' into fire-extinguishers 2014-10-31 20:29:00 -04:00
PsiOmega
aa3e52b1be Adds sanity check for the mecha fire extingusher as well. Would rather remake it to be based on the standard extinguisher code but that's a dev project. 2014-10-29 08:07:36 +01:00
Chinsky
c8e27555b9 Merge pull request #6857 from mwerezak/hoverpod
Hoverpod tweaks and mecha/working code cleanup
2014-10-29 06:31:20 +03:00
mwerezak
e549a22bba Removes world print, re-adds react() call
Also removes checks for if(W.reagent) in extinguisher code, as that is
being handled separately.
2014-10-28 22:13:42 -04:00
Chinsky
3839644bd8 Merge pull request #6651 from PsiOmegaDelta/PowerTwo
Ports /tg/'s cable and powernet code
2014-10-26 23:54:31 +03:00
mwerezak
a2cf18174b Allows toggling hoverpod stabilization 2014-10-26 13:18:04 -04:00
mwerezak
cd1d457323 Factors out common mecha/working procs
Refactors a bunch of identical hoverpod and ripley procs and moves them
into mecha/working
2014-10-26 13:17:31 -04:00
mwerezak
4e7a8fac34 Hoverpod tweaks
Hoverpods are a subtype of mecha/working again, but drills are now
ripley specific. Hoverpods have increased cargo and can carry 3 tools.
Hoverpod crates now come with a clamp and passenger compartment
pre-installed.
Brings back the combatpod, can equip weapons.
2014-10-26 13:16:30 -04:00
mwerezak
a0b47ce4de Water cools hot turfs even if they do not have a hotspot.
Also adjusts fire extinguisher volumes to correspond to the new beaker
volumes, and scales things accordingly.
2014-10-24 21:45:02 -04:00
PsiOmega
8e3861141c Merge branch 'dev' into PowerTwo
Conflicts:
	code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
mwerezak
a8a0d6f1cf Cleans up hovererpod move code, adds ion trails
No need to duplicate the mecha move code when we're only interested in
drifting. The hoverpod also starts drifting when it runs out of power,
now.
2014-10-23 00:25:18 -04:00
mwerezak
e8f3524b11 Fixes #6822 2014-10-22 21:56:43 -04:00
mwerezak
604ad08f07 Fixes #6820
Readds missing check, makes hoverpods their own mech type and moves them
to another folder.
2014-10-22 00:15:42 -04:00
PsiOmega
36c9f65bb1 Ports /tg's cable and powernet code to our code base. 2014-10-10 14:59:44 +02:00
mwerezak
cfd5bcb576 Force removing a passenger now has a delay 2014-10-09 00:33:59 -04:00
mwerezak
b774d35ebc Fixes #6622
Toggling passenger compartment locks now displays a message.
2014-10-09 00:33:40 -04:00
mwerezak
db113115c6 Allows removing passengers through maint protocols 2014-10-04 02:07:15 -04:00
Zuhayr
70eedc3486 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-30 12:18:16 +09:30
Iamgoofball
6a5821af8d "WAH WAH I'M TOO LAZY TO COPY PASTE AND REMOVE A FEW TABS" 2014-09-29 14:28:10 -07:00
Gamerofthegame
33b9d19df1 Commit repair 2014-09-28 17:13:42 -04:00
Zuhayr
223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
PsiOmega
73bf76db98 No longer presents Kelvin as degrees. 2014-09-14 11:38:03 +02:00
Mloc-Argent
712e209ab6 Merge remote-tracking branch 'upstream/master' into dev
Conflicts:
	code/__HELPERS/text.dm
	code/game/machinery/podmen.dm
	code/game/machinery/vending.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
Kelenius
505f857eb8 Stack update 2014-09-02 09:59:32 +04:00
Zuhayr
059532c155 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2014-09-01 22:03:29 +09:30
Kilakk
fa9d9062bd Fixes #6163
* Rounded res.amount to keep the fabricator from dispensing non-integer numbers of stacks
* Added a check to prevent stacks of < 1 from being put into the fabricator
2014-08-26 21:02:06 -04:00
Chinsky
1c2cc138d6 Merge pull request #6168 from Kelenius/OfCablesAndStacks
Cables are now stacks
2014-08-26 15:25:31 +04:00
Kelenius
a1348faa8c Cables are now stacks 2014-08-25 18:54:35 +04:00
PsiOmega
3367fdf8bb Now mecha area denial feedback is closer to 5 seconds apart then ever. 2014-08-24 23:41:15 +02:00