Commit Graph

15518 Commits

Author SHA1 Message Date
Zuhayr
803c5c557e Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenorewrite 2014-09-29 06:21:49 +09:30
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
9fcde12b4f Organ rewrite mapclean attempt. 2014-09-29 06:18:58 +09:30
Hubblenaut
c783549015 Option to withdraw chargecard or cash at ATM 2014-09-28 21:53:19 +02:00
Hubblenaut
e7620cd81a Spacecash is now stackable and called 'Thalers' 2014-09-28 21:52:56 +02:00
Hubblenaut
109ef9ac89 Adds gambling tables 2014-09-28 21:48:57 +02:00
Jarcolr
6a3f5d24d8 Adds 5 approved custom items to code
http://baystation12.net/forums/viewtopic.php?f=33&t=11097
http://baystation12.net/forums/viewtopic.php?f=33&t=11138
http://baystation12.net/forums/viewtopic.php?f=33&t=11300
http://baystation12.net/forums/viewtopic.php?f=33&t=11337
2014-09-28 21:31:24 +03:00
Chinsky
6eea41bcc1 Merge pull request #6535 from Hubblenaut/master
Fixes rolled down jumpsuits not adjusting body flags
2014-09-28 21:22:00 +04:00
Chinsky
104eb426d5 Merge pull request #6537 from mwerezak/flow-rate-meter
Fixes pressure regulator flow rate reporting
2014-09-28 21:21:26 +04:00
Zuhayr
97801b4617 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-29 00:39:43 +09:30
Boop
7116415e4d Fix meteors
yay
2014-09-28 15:59:02 +01:00
Hubblenaut
79c0d3470a Fixes non-used flavor text causing line breaks 2014-09-28 15:48:39 +02:00
Hubblenaut
1212338c2e Fixes rolled down jumpsuits now adjusting body flags 2014-09-28 15:48:38 +02:00
Zuhayr
afdcb1f564 Merge pull request #6518 from faerindel/adv_scanner_print
Adds printing occupant status option to bodyscanners.
2014-09-28 22:15:15 +09:30
Zuhayr
9a01da0519 Merge pull request #6437 from atlantiscze/Supermatter-O2-Fix
Supermatter Tweak
2014-09-28 22:12:21 +09:30
Zuhayr
e4086b3baf Merge pull request #6524 from Mordeth221/dev
Added helm for use in events and other things
2014-09-28 22:05:34 +09:30
mwerezak
5dae1fb667 Fixes pressure regulator flow rate reporting
Fixes the pressure regulator's reported flow rate not being set to 0
when no gas could be transferred.
2014-09-27 19:41:53 -04:00
Snapshot
e70afe0413 Merge pull request #6522 from PsiOmegaDelta/Misc
Misc changes
2014-09-27 10:57:52 -07:00
Chinsky
a2351ab952 Merge pull request #6529 from mwerezak/language
Fixes #6520
2014-09-27 14:21:29 +04:00
mwerezak
7a2b3b6661 Fixes #6520 2014-09-27 03:00:26 -04:00
PsiOmega
778f47649c Departments now have their air/scrubber pipes routed through relevant substations. 2014-09-26 23:21:40 +02:00
Mordeth221
4e8f57cd2d Added helm for use in events and other things 2014-09-26 17:30:41 +01:00
PsiOmega
9728061e40 Doubles the amount of camera locations an AI can store 2014-09-26 17:32:10 +02:00
PsiOmega
a8bf58e613 Emergency shutters no longer make the most important admin logs in the world. 2014-09-26 17:31:51 +02:00
igalan
52caa42e8e Split fetching data and its formatting to separate procs. 2014-09-26 00:50:05 +01:00
Chinsky
ae0b48938d Merge pull request #6509 from mwerezak/door-message
Updates synth airlock interface messages
2014-09-26 00:44:04 +04:00
igalan
2c1618bdd7 Adds printing occupant status option to bodyscanners. 2014-09-25 20:04:34 +01:00
Zuhayr
cc52be3192 Merge resolution, replaced 2 wires lost in map merge. 2014-09-25 23:54:24 +09:30
Zuhayr
b78e2b0c79 Fixes #6297 2014-09-25 21:49:20 +09:30
Chinsky
5b29615c74 Merge pull request #6504 from PsiOmegaDelta/LessWhine
Medbot now less of a Nagbot
2014-09-25 15:52:29 +04:00
Zuhayr
9272bc4542 Fixes #6351 and #6350. 2014-09-25 21:19:35 +09:30
Zuhayr
9bb4ebe205 Minor name fix from VampyreBytes/Paradise. 2014-09-25 20:07:37 +09:30
Zuhayr
c232b4e921 Fixes #5451 by stealing JimTheCactus' and VampyrBytes' work - thanks dudes. 2014-09-25 20:07:11 +09:30
Zuhayr
cddbce688d Fix for potential infinite splint farming exploit in previous commit. 2014-09-25 19:43:17 +09:30
Zuhayr
e41c584ace Fixes #6325 2014-09-25 19:33:46 +09:30
Zuhayr
6bdf515ef3 Makes species mutation a bit easier. 2014-09-25 18:48:29 +09:30
Zuhayr
7682711442 Fixes #6474 2014-09-25 18:45:27 +09:30
Zuhayr
8e9fc05b67 Fixes #6484 2014-09-25 18:36:25 +09:30
Zuhayr
86ce5c19e2 Fixes #6495 2014-09-25 18:33:42 +09:30
Zuhayr
239c380364 Fixes #6466 2014-09-25 18:32:51 +09:30
Zuhayr
e024ef3876 Fixes #6401 2014-09-25 18:28:14 +09:30
Zuhayr
b32d25b1bd Fixes #6503 2014-09-25 18:01:46 +09:30
Zuhayr
4e6afd282c Fixes #6488 2014-09-25 17:59:28 +09:30
mwerezak
e6154d5097 Updates synth airlock interface messages 2014-09-24 19:14:40 -04:00
Zuhayr
25515e9afc Merge pull request #6502 from PsiOmegaDelta/MapFixes
Post-dev/master merge map fixes
2014-09-25 05:53:46 +09:30
Chinsky
69ed2317bf Merge pull request #6428 from atlantiscze/cyborg-power
Cyborg power overhaul
2014-09-25 00:19:13 +04:00
PsiOmega
63d2678c3e Medbot now less of a Nagbot
No longer relies on spawn()
Increased chatter delay.
Points and speaks at the same time.
2014-09-24 16:45:53 +02:00
PsiOmega
93ef5dbe2f Map fixes
Restores maintenance areas to the new variants.
The HoP's office is no longer a crew sleeping quarter.
Fixes disconnected power cables all over the place.
Connects the engineering power monitor to the main/red power grid.
Emergency shutters.
New icon for the research dock.
2014-09-24 15:59:08 +02:00
Atlantiscze
e7f3533158 Cyborg Lights
- Cyborg lights now use the reworked power system.
- Removed flashlight from cyborg modules, replaced with integrated light.
- "toggle-lights" verb is added for cyborgs, which de/activates the integrated light. Uses 30W (*modifier) of power when active.
- Cyborg lights have luminosity of 6 (flashlight has 4).
2014-09-24 09:41:19 +02:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30