Commit Graph

23269 Commits

Author SHA1 Message Date
Zuhayr
e0f23aead5 Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP. 2015-03-11 21:17:51 +10:30
Chinsky
9c30024ca0 Merge pull request #8411 from volas/admin_stuff
Some admin stuff
2015-03-10 09:09:35 +03:00
PsiOmegaDelta
78d67a717a Merge pull request #8384 from comma/spookycat
Gave Runtime spirit-sensing capabilities.
2015-03-09 21:17:23 +01:00
PsiOmegaDelta
d2ab1713ee Merge pull request #8383 from comma/timetravel
Randomized roundstart hour
2015-03-09 21:17:11 +01:00
PsiOmegaDelta
668c4baee7 Merge pull request #8382 from comma/monkey_revenge
Allows you to scoop monkeys up
2015-03-09 21:17:03 +01:00
volas
5fa66b2a8a Changes to aooc 2015-03-09 22:59:52 +03:00
volas
e4e8ef3392 Merge remote-tracking branch 'upstream/dev' into admin_stuff
Conflicts:
	code/modules/admin/admin_verbs.dm
2015-03-09 18:11:10 +03:00
volas
a9b30da7cc Small correction 2015-03-09 16:53:08 +03:00
volas
ca07914424 Ability to search bans by bantype 2015-03-09 15:15:08 +03:00
volas
59a113f91c Ability to search bans by ip and id, and also matches 2015-03-09 15:12:51 +03:00
errorage
64d6012399 Added the ability to define the ip and computer id for a manual ban (in the banning panel). This is so mirroring bans or banning people who were not online during the round in progress does not require admins to spawn a mob, set their variables and then ban the mob.
If however an admin attempts to add a manual ban for a player who was present during the current round, a player who still has a mob somewhere in the game world, the proc will prioritize the mob's ip and computer id variables, not the things entered in the banning panel form.
2015-03-09 15:08:47 +03:00
volas
515fdc9f6e 'Who' verb now shows the age of players on the server for admins 2015-03-09 14:20:31 +03:00
Chinsky
d8c2a36f9f Merge pull request #8387 from PsiOmegaDelta/ChangeAppearance
Mirror and ERT appearance improvement.
2015-03-09 13:42:19 +03:00
PsiOmegaDelta
e8e6a1a905 Merge pull request #7752 from Loganbacca/projectiles
Projectile effects
2015-03-09 11:40:15 +01:00
Chinsky
633943193f Merge pull request #7 from mwerezak/breathing-cleanup
Partial breathing refactor
2015-03-09 12:50:04 +03:00
volas
c7573a0d11 Antag-OOC 2015-03-09 12:19:50 +03:00
volas
2ad8d26aeb Play server sound verb for admins 2015-03-09 12:19:47 +03:00
Loganbacca
11d340f898 Projectile effects - Part 3
- Fixes for turrets, rogue drones, and emitters
- Removed muzzle flash from chem darts
- Converted emitters to use spanclasses and have correct capitalization
2015-03-09 22:17:34 +13:00
Loganbacca
80381a87d0 Projectile effects - Part 2
- Converted the root projectiles object to support the new effects system at a generic level
- Converted laser beams to use the new effects system and removed the relics of the old system
- Added muzzle flash for ballistic ammo
2015-03-09 22:17:18 +13:00
Loganbacca
54971c1bf5 Projectile effects - Part 1
- Added base projectile effects framework
- Added vector movement helper
- Added temporary effect sprites
2015-03-09 22:17:06 +13:00
PsiOmegaDelta
8dd6f97bc1 Merge pull request #8407 from mwerezak/flashpoint
Implements phoron flashpoint, fixes neverending fires
2015-03-09 09:57:22 +01:00
Chinsky
5b7368e627 Merge pull request #8386 from volas/heartbeat
Heartbeat sound
2015-03-09 11:45:10 +03:00
mwerezak
c432268596 Fixes fires burning forever
Fixes fires grinding to a near halt but never actually stopping.
2015-03-09 01:45:31 -04:00
mwerezak
0f290f0ffd Implements phoron flashpoint 2015-03-09 01:00:26 -04:00
mwerezak
b71f6c1121 Partial breathing refactor
Reorganizes breathing, and moves common human/monkey breathing code into
carbon. handle_breath() is largely unchanged.
Removes unnecessary handle_internal_lifeform().
Fixes monkies being held by people in mecha in space not being able to breathe.
2015-03-09 00:09:34 -04:00
Zuhayr
a508651115 Merge pull request #8381 from comma/mindfuck
More hallucinations mindufuckery
2015-03-09 03:23:36 +10:30
volas
3d55fc58b9 Additional checks for heartbeat, reduced volume 2015-03-08 19:27:31 +03:00
PsiOmega
6749e09ead Makes available ERT species a config option. 2015-03-08 15:45:52 +01:00
PsiOmega
44c7b2367a Admin verbs and white/blacklisting or races.
Makes it possible for admins to bring out the appearance changer at will, controlled either by themselves or the mob in question.
Makes it possible to define custom race white/blacklisting in the appearance changer. However, this does not override the player's own racial restrictions.
2015-03-08 12:25:34 +01:00
PsiOmega
c6b0370b6a Mirror and ERT appearance improvement.
NanoUI-based appearance changer, with flags to set exactly which parts of the appearance which can be changed.
2015-03-07 23:11:00 +01:00
volas
cef52c73f8 Heartbeat 2015-03-07 18:03:49 +03:00
Chinsky
64f42d592c Gave Runtime spirit-sensing capabilites. Every tick there's a 2% chance she'd stare at a place where ghost is. 2015-03-07 16:48:21 +03:00
Chinsky
2d6b8a9a82 Randomizes roundstart time, one of few times 5 hours apart are picked. 2015-03-07 16:25:40 +03:00
Chinsky
f3b6c65038 Added new hallucinations effect - spinning. Changes client dir for 3-5 second for a /real/ mindbreaking. Minor sprite oddities that appear in that mode shouldn't be an issue if you are hallucinating and only last for few seconds anyway. 2015-03-07 16:23:31 +03:00
Chinsky
b730e8309e Fixed monkeys suffocating. Also monkeys with harm in mind are not scoopable now for balance. 2015-03-07 16:03:43 +03:00
Chinsky
ba6d0e9722 Restored accidently deleted icon file 2015-03-07 15:29:49 +03:00
Chinsky
fae7d1c9e9 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into monkey_revenge
Conflicts:
	code/modules/mob/holder.dm
	code/modules/mob/living/carbon/monkey/monkey.dm
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
2015-03-07 15:18:54 +03:00
Zuhayr
f09f00d8ac Merge pull request #8377 from MrSnapwalk/newposters
Adds 8 new posters.
2015-03-07 20:15:44 +10:30
MrSnapwalk
cb0ec5abe4 Adds 7 new posters. 2015-03-06 21:14:32 -06:00
Zuhayr
3895349787 Merge pull request #8374 from Baystation12/dev-freeze
Dev freeze into dev
2015-03-07 12:05:32 +10:30
Zuhayr
7bdb1b9266 Merge pull request #8375 from Zuhayr/dev-freeze
Compile fix after broken merge.
2015-03-07 11:59:55 +10:30
Zuhayr
ac860b976a Fixing compile issues, adjusted buckle code after a weird merge. 2015-03-07 11:52:14 +10:30
Zuhayr
9f1e04aa50 Thanks TortoiseGit. 2015-03-07 11:40:00 +10:30
Zuhayr
af4dcca640 Merge pull request #8373 from Zuhayr/dev-freeze
Dev freeze
2015-03-07 11:34:15 +10:30
Zuhayr
1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +10:30
Zuhayr
44e280dbe4 Merge pull request #8372 from PsiOmegaDelta/Runtimes
Runtime fixes
2015-03-07 10:58:13 +10:30
PsiOmega
0262ab0de0 Runtime fixes
Fixes
````
runtime error: Cannot read null.name
proc name: sql report cyborg death (/proc/sql_report_cyborg_death)
  source file: statistics.dm,87
  usr: the maintenance drone (106) (/mob/living/silicon/robot/drone)
  src: null
````

````
runtime error: Cannot read null.name
proc name: sql report death (/proc/sql_report_death)
  source file: statistics.dm,52
  usr: null
  src: null
````
````
runtime error: Cannot read null.armor
proc name: infection check (/proc/infection_check)
  source file: helpers.dm,16
  usr: null
  src: null
````
````
runtime error: bad client
proc name: open (/datum/nanoui/proc/open)
  source file: nanoui.dm,419
  usr: null
  src: /datum/nanoui (/datum/nanoui)
/datum/nanoui (/datum/nanoui): open()
````
````
runtime error: undefined variable /obj/effect/plantsegment/var/movable
proc name: update canmove (/mob/proc/update_canmove)
  source file: mob.dm,862
  usr: null
  src: the monkey (643) (/mob/living/carbon/monkey)
````
2015-03-06 18:39:44 +01:00
Zuhayr
b884878e50 Merge pull request #8368 from PsiOmegaDelta/DoorPlox
Airlock/door changes
2015-03-06 22:18:59 +10:30
Zuhayr
82640b95e9 Merge pull request #8370 from PsiOmegaDelta/PaperTracking
AI can now track people holding up objects to the camera.
2015-03-06 22:18:27 +10:30
Chinsky
32e9dd7fea Merge pull request #8366 from mwerezak/toolbox
Storage and toolbox update
2015-03-06 12:12:31 +03:00