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
Kelenius
5fac67ea4e
Adds a voting link to the vote notification
2015-05-17 13:33:49 +03:00
Github is ok, I guess
77206c6f5f
Update gameticker.dm
2015-05-17 10:36:59 +01:00
Github is ok, I guess
229087c269
Update statistics.dm
2015-05-17 10:36:20 +01:00
PsiOmega
c16d033b18
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2015-05-17 11:30:04 +02:00
PsiOmegaDelta
b423ba7bc4
Merge pull request #9319 from Baystation12/master
...
Dev-freeze
2015-05-17 11:29:39 +02: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
RavingManiac
53eec427dc
Typo fix. Obsolete viisible_message() hack removed from mob holders
2015-05-17 17:15:27 +10:00
RavingManiac
22cafb9c48
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2015-05-17 17:01:43 +10:00
RavingManiac
f66cf9af05
get_mobs_in_view() renamed to get_mobs_or_objects_in_view(). Returns mobs or objects depending on specifications
...
Transmission of emotes, visible_message() and say() refactored. All three use get_mobs_or_objects_in_view() to find objects and mobs in containers
Storage objects and closets no longer transfer hear_talk(), see_emote() or show_message() to contents, as this is already covered by the above changes
2015-05-17 16:54:18 +10:00
Chinsky
1f76ae4250
Merge pull request #9306 from PsiOmegaDelta/ArtifactTele-150516
...
Teleport anomaly fix.
2015-05-17 09:07:53 +03:00
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
PsiOmega
8b39f9201a
Compilation fixes.
2015-05-16 22:41:13 +02:00
PsiOmega
83a09faf07
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/modules/mob/living/carbon/brain/MMI.dm
code/modules/projectiles/guns/launcher/crossbow.dm
code/modules/projectiles/guns/launcher/pneumatic.dm
2015-05-16 22:38:01 +02:00
PsiOmegaDelta
4db25c61d2
Merge pull request #9313 from Baystation12/master
...
Dev-freeze
2015-05-16 22:36:03 +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
mwerezak
9ae57e95e1
Moves mob animations to a new source file, adds attack animation
2015-05-16 12:44:49 -04:00
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
PsiOmegaDelta
d4c205e12a
Merge pull request #9200 from mwerezak/tail-swish
...
Tail swish animations, tail icon caching
2015-05-16 18:16:41 +02:00
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
PsiOmega
21dad8bdc0
Teleport anomaly fix.
...
It should no longer teleport mobs inside other atoms.
Making the dangerous assumption that touch-teleportation actually works.
2015-05-16 14:46:57 +02:00
PsiOmega
aad28d63ce
Cleans up welder code.
...
Icon and inhand states should now update properly.
2015-05-16 14:13:24 +02:00
Zuhayr
150b24023e
Renamed kitchen utensils.
2015-05-16 21:24:36 +09:30
PsiOmegaDelta
65151ade35
Merge pull request #9298 from Kelenius/ofInflatablesAndDeflate
...
Inflatables now lose deflate verb when it's used
2015-05-16 13:51:16 +02:00
PsiOmegaDelta
98fce1fa1e
Merge pull request #9301 from Kelenius/ofChemAndRuntime
...
Fixes #9294
2015-05-16 13:47:05 +02:00
Zuhayr
f4923e2a20
Renamed twohanded weapons, collapsed bats.
2015-05-16 21:12:54 +09:30
Zuhayr
a32179a062
Renamed knives.
2015-05-16 20:54:34 +09:30
Chinsky
2359245f06
Merge pull request #9285 from mwerezak/master-fixes
...
Pneumatic cannon fix
2015-05-16 14:19:22 +03:00
Zuhayr
8aa24b86bb
Renamed shards, katanas, claymores.
2015-05-16 20:36:33 +09:30
Zuhayr
0fb27e83b0
Preliminary file for material weapon system.
2015-05-16 20:14:35 +09:30
Zuhayr
f27ddd548f
Restructuring a bunch of files in prep for widespread path changes.
2015-05-16 20:09:28 +09:30
Zuhayr
966d797e07
Converts bat to use the material system.
2015-05-16 19:59:21 +09:30
GinjaNinja32
137c77c19d
Typo fix
2015-05-16 10:48:59 +01:00
