cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-06-06 22:14:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,454 Commits 8 Branches 26 Tags
1a94dea2ea53b535965a2919bcf6b622fb9cb2db
Commit Graph

12971 Commits

Author SHA1 Message Date
Zuhayr 150b24023e Renamed kitchen utensils. 2015-05-16 21:24:36 +09:30
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 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
Zuhayr 1de493c272 Fixes #9021 2015-05-16 18:45:31 +09:30
Kelenius b4bfe917eb Fixes #9294 2015-05-16 12:05:14 +03:00
Zuhayr 36acf64f18 Partial fix for #8825 2015-05-16 18:33:03 +09:30
Zuhayr e1a14e3c41 Removes xenoarch reconstitutors entirely. "Fixes" #5413 2015-05-16 17:40:49 +09:30
GinjaNinja32 76654321e4 Merge remote-tracking branch 'upstream/dev' into new_tables 
Conflicts:
	code/setup.dm
 2015-05-16 08:53:33 +01:00
PsiOmegaDelta 05033b5762 Merge pull request #9278 from Ccomp5950/ravensrequest 
Admin log fix:  Something that really annoys ravensdale.
 2015-05-16 09:29:15 +02:00
PsiOmegaDelta 07cb2aa1ad Merge pull request #9291 from Techhead0/seeTheInvisible 
Invisible people can now be heard by visible_message
 2015-05-16 08:57:21 +02:00
mwerezak 413276a4c5 Allows damage to accumulate past max_damage on vital organs 
Fixes #9214
 2015-05-16 02:05:44 -04:00
RavingManiac c67ed25b85 visible_message() now affects objects. Holopads, pAIs, AI cards people in mecha should hence be able to see them 
Tape recorders record hearable emotes and action messages

Human and robot emotes now use custom_emote()
 2015-05-16 16:01:41 +10:00
Ccomp5950 10a8c56c5d Merge pull request #9286 from Zuhayr/dev 
Fixes, clothes stripping refactor.
 2015-05-16 00:53:14 -04:00
mwerezak d71a727131 remove_from_mob() considered harmful 2015-05-16 00:32:44 -04:00
mwerezak 5d620ff05b Span classes 2015-05-16 00:21:40 -04:00
mwerezak 3e41d6ff6e Fixes crossbow icon issue 
Fixes an issue with the crossbow icon that occurred when releasing the
tension soon after starting to draw it back.
 2015-05-15 23:06:29 -04:00
mwerezak 65819302f3 Fixes #8986, one less object verb 2015-05-15 23:06:02 -04:00
mwerezak 29609f7ec6 Fixes #8985, ammo magazine examine grammar. 2015-05-15 23:04:50 -04:00
Techhead0 35e44ab8d9 Invisible people can now be heard by visible_message 
Uses blind_message instead of letting the Ninja/whatever do things
unseen.
 2015-05-15 21:06:16 -04:00
ccomp5950 19cc6df391 Conversion to admin_attack_log() 2015-05-15 17:07:07 -04:00
Techhead0 ec37652997 Fixes #7999 2015-05-15 13:34:46 -04:00
Zuhayr f021467f8b Merges two redundant procs. 2015-05-16 01:55:19 +09:30
Zuhayr 890693b839 Allowed accessories to function as custom items using icon_override 2015-05-16 01:37:04 +09:30
Zuhayr 8611499e87 Fixes #8842 2015-05-15 23:53:59 +09:30
Zuhayr 7535e027b9 Fixes #9192 2015-05-15 23:53:38 +09:30
Zuhayr f65c4e95f6 Fixes #9060 2015-05-15 23:38:01 +09:30
Zuhayr 325bd42c66 Fixes #9233 2015-05-15 23:37:52 +09:30
Zuhayr 256c057608 Fixes #8376 2015-05-15 23:27:33 +09:30
Zuhayr 5b9eefdebf Merge with dev. 2015-05-15 23:22:48 +09:30
Zuhayr 1e1471a601 Removes equip_e effect. Rewrites stripping, refactors cuffing. Fixes #8173. 2015-05-15 23:19:57 +09:30
Zuhayr 624a6b0bca Fixes #9250 2015-05-15 18:26:53 +09:30
Kelenius 10915eae24 Merge branch 'dev' into ofChemistryAndStuff 
Conflicts:
	code/game/objects/effects/chem/chemsmoke.dm
	code/modules/customitems/item_defines.dm
	code/modules/projectiles/guns/launcher/syringe_gun.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Toxins.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/pill.dm
	maps/exodus-1.dmm
 2015-05-15 11:28:05 +03:00
PsiOmegaDelta 68d85556d0 Merge pull request #9282 from Zuhayr/dev 
Fixes
 2015-05-15 08:25:04 +02:00
PsiOmegaDelta b963e807f6 Merge pull request #9273 from GinjaNinja32/grab_del 
Fixes grabs runtiming on qdel()
 2015-05-15 08:22:52 +02:00
Zuhayr fe3f169959 Fixes #9234 2015-05-15 13:53:01 +09:30
Zuhayr 30cda10bb3 Fixes #9226 2015-05-15 13:43:28 +09:30
Zuhayr 95ea7c110c Fixes several wall issues. 2015-05-15 13:43:00 +09:30
GinjaNinja32 354859b889 Generalises shards, makes tables possibly create shards when falling apart, make tablesmash potentially give someone a faceful of broken glass if the table breaks 2015-05-15 04:47:18 +01:00
ccomp5950 735202d409 Admin log fix: Something that really annoys ravensdale. 
<Ravensdale1> [X] has shot [y] with a the bullet

http://i.imgur.com/F54KjJ3.png
 2015-05-14 21:07:36 -04:00
mwerezak 7c242b2c8c Tail animation resets when unconscious, changelog 2015-05-14 19:14:22 -04:00
GinjaNinja32 21394e78c4 Merge remote-tracking branch 'upstream/dev' into new_tables 2015-05-15 00:12:40 +01:00
GinjaNinja32 363ce0a925 Fixes grabs runtiming on qdel() 2015-05-15 00:07:45 +01:00
GinjaNinja32 a3662a9088 Fixes, improvements, suggestions. 2015-05-15 00:06:47 +01:00
PsiOmegaDelta 4f40e92a95 Merge pull request #9272 from Mloc/nanoui 
better nanoui caching + fixes
 2015-05-14 23:48:15 +02:00
Mloc cfb51cf198 better nanoui caching + fixes 
Signed-off-by: Mloc <colmohici@gmail.com>
 2015-05-14 22:35:50 +01:00