cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-18 02:19:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,241 Commits 91 Branches 23 Tags
c7573a0d11a37dc2dfd14699a30a8bb687fe2eb8
Commit Graph
17497 Commits
Author SHA1 Message Date
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
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
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
volas cef52c73f8 Heartbeat 2015-03-07 18:03:49 +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
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 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 1984ef6e51 Master into dev-freeze. 2015-03-07 11:33:39 +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 36233b72e2 Merge pull request #8367 from mwerezak/cult-conversion 
Improves cult conversion
 2015-03-06 11:57:03 +03:00
Chinsky 07ee8424da Merge pull request #8371 from mwerezak/gun-rewrite 
Edits Z8 desc
 2015-03-06 11:56:31 +03:00
mwerezak 875f805724 Edits Z8 desc 2015-03-06 00:06:53 -05:00
mwerezakandmwerezak 32ee4d57dd Improves cult conversion 
Now uses a continuous damage system, dealing damage once every 100 ticks (~10 seconds).
Also improves effects dealt when resisting conversion.
 2015-03-05 23:58:56 -05:00
Chinsky f064305a7b Fixes #8268 2015-03-06 07:11:19 +03:00
Daniel García Baldomir 429b35b526 Removed auto_use_power from process. 2015-03-06 00:05:22 +01:00
Daniel García Baldomir 73ca3b0656 Fixed holosign not being registered as machine. The master controller does not find you worthy of the machines list if you don't process. 2015-03-05 23:30:06 +01:00
PsiOmega 5d89e3eea5 Airlock changes. 
It's now possible to pass through doors sooner after they start opening, and for longer as they're closing.
Doors no longer use sleeps to decide when to close. Avoids issues where quickly opening, closing, then opening a door again causes it to close pre-maturely.
 2015-03-05 22:44:08 +01:00
PsiOmega bdd84767d1 AI can now track people holding up objects to the camera. 2015-03-05 22:28:22 +01:00
Daniel García Baldomir 94477bd66c Minor fixes on the overlays. Made holosigns functional again. 2015-03-05 21:47:26 +01:00
PsiOmegaDelta 45e2423dca Merge pull request #8365 from Ccomp5950/re-admin 
Staff now have a "re-admin self" button after de-admining themselves.
 2015-03-05 18:10:46 +01:00
mwerezak 9f55526bce Toolboxes can now hold a limited number of w_class 3 items 
They can hold up to 3 w_class 3 items, or the usual 7 w_class 2 items.
 2015-03-05 11:10:26 -05:00
mwerezak 9aed472531 Minor storage cleanup 
Demotes folding to storage/box, makes doughnut boxes a subtype of box.
Removes a couple of istype() hacks from storage.
 2015-03-05 11:08:22 -05:00
ccomp5950 ebabf53c6d Staff now have a "re-admin self" button after de-admining themselves. 
Stores their admin datum in a deadmin_holder variable in the client, and just moves it back upon re-admining.
 2015-03-05 11:05:58 -05:00
mwerezak 3bf5a5ca99 Updates storage costs 
Storage cost of an item is now twice that of the next smallest item, instead of being equal to the w_class.
Items with w_class 1 or 2 are unaffected. This produces much better behaviour for containers that are limited
by storage space instead of slots, such as how toolboxes are planned to work in a future update.
 2015-03-05 10:40:25 -05:00
PsiOmega 3e9f33136a Merge remote-tracking branch 'upstream/dev-freeze' into dev 
Conflicts:
	code/game/objects/effects/decals/Cleanable/fuel.dm
	maps/exodus-5.dmm
 2015-03-05 09:20:20 +01:00
PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze 
Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm
 2015-03-05 08:05:44 +01:00
Zuhayr b62a6dc76d Merge pull request #8354 from PsiOmegaDelta/Jaunt 
Fixes #8342.
 2015-03-05 12:47:01 +10:30
Zuhayr 5e90eba7d7 Merge pull request #8347 from PsiOmegaDelta/PushItHarderBetterStrongerFaster 
An inhabited AI core can now be pushed.
 2015-03-05 12:44:28 +10:30
Zuhayr c9a2ed84fe Merge pull request #8352 from PsiOmegaDelta/LessEdits 
Mappings.
 2015-03-05 09:20:03 +10:30
Zuhayr b4b43a6206 Merge pull request #8350 from PsiOmegaDelta/NanoRuntime 
Fixes NanoUI transfer runtime.
 2015-03-05 09:19:41 +10:30
PsiOmegaDelta decb9a79eb Merge pull request #8355 from Neerti/2-28-2015_teg_prettyness 
New TEG sprite, NanoUI for TEG, and a runtime fix.
 2015-03-04 20:09:56 +01:00
Raptor1628 cf0e526d91 Fixes and adjustments 
Moves a few things around in the armory again, tasers back in lockers,
guns in officer access area of the armory. Re-adds the tacknife after it
was lost in the hydro merge, gives EMTs access to medical lockers.
 2015-03-04 11:18:40 -05:00
PsiOmega 8feec5760f Fixes #8342. 
Secbots now continually checks if their target remains in sight before bashing the head in.
 2015-03-04 16:54:07 +01:00
Neerti f229aa479f Adds a bunch of prettiness to the TEG, fixes a runtime. 2015-03-04 09:13:05 -05:00
PsiOmegaDelta 7d3c01c51e Merge pull request #8341 from mwerezak/temperature-fix 
Fixes #7363
 2015-03-04 12:40:54 +01:00
PsiOmegaDelta 6799569d16 Merge pull request #8344 from comma/surgeryfixies 
Surgerything
 2015-03-04 11:00:22 +01:00
Chinsky 198abc02f6 Merge pull request #8345 from PsiOmegaDelta/Triumvirate 
Multiple AIs no longer guaranteed to receive the same ion laws.
 2015-03-04 12:51:31 +03:00
PsiOmega 81b0ab3bcf Mappings. 
Makes specific instances of the engine room air alarm and AI APC.
Includes some map cleanup by Dream Maker itself.
 2015-03-04 10:21:36 +01:00
PsiOmega 05c487ca8f Fixes NanoUI transfer runtime. 
No longer unconditionally attempts to transfer NanoUIs from one mob to another.
Previously caused runtimes if the source-mob was gibbed or otherwise destroyed.
 2015-03-04 09:46:49 +01:00
mwerezakandmwerezak f8831fa513 Adjusts human temperature damage intervals 2015-03-03 19:31:01 -05:00
Chinsky 43cc464c28 Merge pull request #8346 from PsiOmegaDelta/Fuel 
Fixes #8343
 2015-03-03 23:55:06 +03:00