Commit Graph

9974 Commits

Author SHA1 Message Date
Chinsky
91de5b2d9d Merge pull request #9381 from GinjaNinja32/patch-1
Fixes #9380
2015-05-21 03:27:28 +03:00
Chinsky
ecc2b3c437 Merge pull request #9258 from mwerezak/charge
Updates instances of power cell usage
2015-05-21 03:24:20 +03:00
Yoshax
7cfb921ca0 Fixes a typo/mistake 2015-05-20 20:36:24 +01:00
GinjaNinja32
c345f317ac Fixes structure climbing 2015-05-20 17:10:18 +01:00
GinjaNinja32
aeb8f2a6c2 Fixes #9380 2015-05-20 16:44:47 +01:00
Zuhayr
71da36ec01 Updated force vars on bats. 2015-05-21 00:52:17 +09:30
Zuhayr
a6f59edc22 Bit of documentation. 2015-05-20 14:00:14 +09:30
mwerezak
c289975498 Adds attack animation calls for a few common machines and structures
- Cameras
- Doors
- Grilles
- Windows
2015-05-20 00:28:57 -04:00
mwerezak
87178d74a6 Adds attack animation calls for attack_generic() 2015-05-20 00:19:39 -04:00
Zuhayr
93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Atlantis
f0cd799021 Changelog + fluff fix
- Finally adds changelog entry
- System override message modified according to github discussion.
2015-05-19 17:28:21 +02:00
Chinsky
8871696c52 Merge pull request #9353 from Ccomp5950/goat_simulator3000
Goat Buffs.
2015-05-19 17:56:55 +03:00
mwerezak
defc4c1f94 Adds check_charge(), checked_use() 2015-05-18 20:09:09 -04:00
mwerezak
53855d2398 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into charge 2015-05-18 18:47:45 -04:00
Atlantis
4cd2417eb8 Implements suggestions from github
- qdel() instead of del()
- z in config.station_levels insted of z == 1
- Typo fix
- Playercount is now 2 instead of 1 which was debug setting
- AI is now properly deleted when struck by very strong explosion (heavy impact).
- Hardware now properly uses install(). Hardware list is generated from existing datums using typesof()
2015-05-18 22:05:18 +02:00
PsiOmegaDelta
ce8188c1a2 Merge pull request #9350 from Hubblenaut/lockers
Fixes overbloated closets
2015-05-18 19:16:59 +02:00
Hubblenaut
ac1f3c3530 Fixes overbloated closets 2015-05-18 18:34:25 +02:00
PsiOmega
e2e0ffc6e5 Compilation fixes. 2015-05-18 18:04:29 +02:00
PsiOmega
c2200109d0 Merge remote-tracking branch 'upstream/dev-freeze' into dev
Conflicts:
	code/game/objects/items/weapons/twohanded.dm
2015-05-18 17:50:48 +02:00
PsiOmegaDelta
a7d72940cf Merge pull request #9348 from Baystation12/master
Dev-freeze
2015-05-18 17:48:36 +02:00
Chinsky
6169c49832 Merge pull request #9143 from Loganbacca/qol_mule
[QOL] MULE destination selection
2015-05-18 18:20:17 +03:00
Daranz
e13bc6ab54 Add access_medical_equip to get_all_accesses() 2015-05-18 08:33:51 -04:00
Chinsky
a3a2c615de Merge pull request #9300 from PsiOmegaDelta/RoundStart
Gamestart cleanup.
2015-05-18 12:00:49 +03:00
ccomp5950
53e52a6f92 Goat Buffs.
Goats now are no longer on Officer Beepsky's shitlist.
Goats will now prefer to step towards vines.
Goats will now "eat" the plants vines leave behind.
2015-05-18 04:35:19 -04:00
Zuhayr
3ed1917c3a Vine tweaks. Fireaxes one-shot vines, vines are mouse opaque. 2015-05-18 13:23:21 +09:30
Chinsky
b08fcb8d3e Merge pull request #9297 from PsiOmegaDelta/RandomWireBreaking
Destroying a camera now also cuts wires randomly.
2015-05-18 00:40:56 +03:00
Mustafa Kalash
a5aede3b70 Gives IA agents bridge access and the HoS' encryption key. Changes IA agents' supervisor to Nanotrasen officials and regulations. 2015-05-17 12:43:20 -04:00
Zuhayr
59bfc08853 Merge pull request #9317 from Dennok/patch-1
Fix connector updates
2015-05-18 00:21:47 +09:30
Zuhayr
8917a03380 Merge pull request #9296 from PsiOmegaDelta/TurfProcessing
Turf processing
2015-05-17 22:51:45 +09:30
Zuhayr
4ea779ae6c Merge pull request #9304 from PsiOmegaDelta/WelderIcon-150516
Cleans up welder code.
2015-05-17 20:21:31 +09:30
Github is ok, I guess
77206c6f5f Update gameticker.dm 2015-05-17 10:36:59 +01:00
Zuhayr
8ce787ef68 Final tweaks to recipe availability and material inheritance. 2015-05-17 18:22:21 +09:30
PsiOmega
2c60619273 Restores the original messages. 2015-05-17 10:25:37 +02:00
Dennok
bd3d26f5bf Fix connector updates 2015-05-17 10:26:59 +03:00
Zuhayr
ed34aa2466 Rebalancing and adjusting divisors for all weapon damage values. 2015-05-17 16:51:55 +09:30
Zuhayr
a540e97e1b Stool and table tweaks, adjusted tables on the map. 2015-05-17 13:41:22 +09:30
Zuhayr
2714e458b3 Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-17 12:58:09 +09:30
Zuhayr
4cd2a5a532 Updating stools/stool padding. 2015-05-17 12:53:23 +09:30
Atlantiscze
71bfe729fa Compile Fix
- Fixes mistake in previous commit.
2015-05-17 02:59:59 +02:00
Atlantiscze
bcfbfdedba CPU Generation adjustment
- Doubles CPU generation from APCs. Testing revealed that current values are simply too small.
- Decreases DualCPU hardware boost to +50% CPU generated (instead of +100%)
- Minor code clean-up at hardware selection screen.
2015-05-17 02:54:58 +02:00
Zuhayr
14df1e5fb5 Converts beds, chairs and stools. 2015-05-17 03:43:59 +09:30
Zuhayr
dbe8221c60 Merge pull request #9308 from Karolis2011/dev
Made sorting and tagger pipes dispensible
2015-05-17 03:23:10 +09:30
Zuhayr
ae3ad84634 Updated ashtrays and mineral doors. 2015-05-17 03:02:03 +09:30
Zuhayr
8f6666a32e Converted barricades to material system. 2015-05-17 02:01:20 +09:30
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Karolis2011
645ad1a177 Made tagger pipe dispensible. 2015-05-16 18:05:47 +03:00
Zuhayr
a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
Zuhayr
b8ca15f541 Tweaks/fixes and greyscale icons. 2015-05-17 00:07:29 +09:30
Karolis2011
0999f1ab78 Made sorting pipes dispesible
also fixes #9305
2015-05-16 17:27:39 +03:00
Zuhayr
83570a1a9e Merge branch 'materials' of https://github.com/Zuhayr/Baystation12 into dev 2015-05-16 23:35:05 +09:30