cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-23 08:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
30,447 Commits 74 Branches 23 Tags
a52092b294d46ef85537c9b51a621191aacfc396
Commit Graph

14255 Commits

Author SHA1 Message Date
skull132
18f60c476f Merge pull request #328 from NanakoAC/AlliesCocktail 
Fixed Allies Cocktail
 2016-05-24 01:59:08 +03:00
NanakoAC
a96d655632 Fixed Sterilizine not sterilising wounds. Also tweaked spraybottle message visibility 
*Sterilizine will now reduce the germ level of all wounds on the mob on
contact, proportional to the quantity sprayed
*Spraybottles will now display the "<Person> sprays <otherperson> with
the <spraybottle>" message when spraying on any mob
 2016-05-22 10:53:04 +01:00
NanakoAC
67b08854e8 Fixed Allies Cocktail 
Fixed allies cocktail, it was asking for an incorrect ID for the martini
 2016-05-21 17:34:58 +01:00
NanakoAC
cbf5606271 Revert "Fixed Allies Cocktail" 
This reverts commit f3b295d13b.
 2016-05-21 17:23:44 +01:00
NanakoAC
f3b295d13b Fixed Allies Cocktail 
The recipe called for 'classicmartini', rather than 'martini' which is
the correct ID of the drink named Classic Martini.

Changed it to require the proper ID
 2016-05-21 17:17:36 +01:00
NanakoAC
6e1c3a6b21 Fixed Painkiller Overdose Hallucinations 
Paracetamol overdose now causes hallucination strength 25
Tramadol overdose now causes hallucination strength 40
Oxycodone overdose now causes hallucination strength  60
 2016-05-21 09:17:44 +01:00
Akrilla
4b2290fc7e Removing errors, will sort out another time. Can't test locally as my server is dead. 2016-05-19 15:21:40 +01:00
Akrilla
c55a0eef21 Commenting out animation. 2016-05-19 15:17:36 +01:00
Akrilla
465da7779a Last try. 2016-05-19 15:14:43 +01:00
Akrilla
b315b479ad Anim fix. 2016-05-19 15:06:02 +01:00
Akrilla
a0e6c3ac79 Change to usr. 2016-05-19 14:59:09 +01:00
Akrilla
cf4f6ba200 Okay, I actually fixed it this time. 2016-05-19 14:52:45 +01:00
Akrilla
570a0bee07 Bug fix. 2016-05-19 14:47:50 +01:00
Akrilla
0520ea0ebe Taking damage or attacks removes stealth. 2016-05-19 14:43:22 +01:00
skull132
d5129d93c0 Merge pull request #311 from Akrilla/cleanbots-fix 
Cleanbots lag fix and code cleanup.
 2016-05-19 03:23:43 +03:00
skull132
e08f80f518 Merge pull request #309 from skull132/master 
Banning Update + WebInterface Button
 2016-05-18 22:18:40 +03:00
skull132
af73877426 Merge pull request #310 from skull132/vampire_rewrite 
Vampire rewrite
 2016-05-18 22:03:04 +03:00
skull132
d136181f8c Ban Mirroring - Hotfix 
Bad prepared statement execution fixed.
 2016-05-18 21:57:53 +03:00
skull132
8447395d85 Vampires - Immunity to disease 
Vampires are now immune to disease.
 2016-05-18 21:50:41 +03:00
Akrilla
5c4af8dd7e Compile error fix. 2016-05-18 18:01:26 +01:00
Akrilla
fdcf42ab0a Fix for cleanbot lag, and a quick rewrite of search loop. 2016-05-18 17:45:09 +01:00
skull132
b1af6d4086 Conflict Resolution 
# Conflicts:
#	interface/skin.dmf
 2016-05-18 17:26:08 +03:00
skull132
79044f3597 Merge pull request #308 from Akrilla/cold-slimes 
Slimes take damage when under their cold threshold.
 2016-05-18 15:25:33 +03:00
skull132
8e675f756f Merge pull request #307 from Akrilla/necrosis-fix 
Fixes #284: Necrotic organ repair fix
 2016-05-18 15:25:08 +03:00
skull132
529a3ea6e3 Merge pull request #300 from ArcBotSS13/spectrometer-fix 
Fixes spectrometer not accepting coolant
 2016-05-18 15:21:56 +03:00
Akrilla
f2da3a0d04 Slimes take damage when under their cold threshold. 2016-05-18 13:04:08 +01:00
Akrilla
a853a3cf73 Fix for necrotic surgery. 2016-05-18 12:40:48 +01:00
skull132
5bbc831f31 Merge pull request #302 from MissBrightdawn/development 
Coffee Machine: Update 1
 2016-05-17 23:46:45 +03:00
Akrilla
35a2b6a9e9 Small change to remove the 'is' prefix from poses. 2016-05-16 15:37:41 +01:00
Akrilla
d118a83bea Fixes heartstop logic with certain chemicals, no longer flat lines. 2016-05-16 15:37:22 +01:00
Akrilla
2e422fb869 Fixes certain chemicals allowing random movement in space. 2016-05-16 15:36:50 +01:00
Brightdawn~
7740b81fbc Coffee Machine: Update 1 
This is only the beginning of the Coffee machine updates and new
recipes!
 2016-05-16 11:04:10 +01:00
ArcBot
9a11c728a8 Fixes spectrometer not accepting coolant 2016-05-15 16:37:20 -04:00
skull132
aec33074de Merge pull request #285 from LordFowl/development 
Vaurca Changes + Map Batch
 2016-05-15 21:00:17 +03:00
skull132
310fadf562 Merge pull request #298 from LordLag/master 
Changes Reroute
 2016-05-15 20:53:45 +03:00
skull132
6287b3be66 Merge pull request #253 from skull132/sql-new-fix 
Fixes #255
 2016-05-15 20:40:44 +03:00
skull132
1caff18271 Vampire - Frenzy 
Implements frenzy mechanics.
Frenzy is usually triggered by chaplain actions, or by being low on blood. It gives you the hulk gene and augments your vision, effectively turning you into a relatively powerful hunter.

To het out of it, you need to consume more blood.
 2016-05-14 15:04:12 +03:00
LordFowl
9390feffef Vaurca Compatibility Patch 
Attempt to make Travis recognize my damn work.
 2016-05-05 20:39:11 -04:00
LordFowl
f85e66640b Compatibility Patch 
Modifies grown.dm, station.dm, snacks.dm, and preferences.dm to be
compatible with the latest devbuild.
 2016-05-05 20:32:40 -04:00
LordFowl
818c3a484f Fixing Preferences 
Manual fix to preferences.dm
 2016-05-05 20:08:06 -04:00
LordFowl
c7ca0887e7 Vaurca Changes 
Various vaurca-based changes, as detailed in the changelogs.
 2016-05-05 19:10:05 -04:00
skull132
92847d06b3 Ban System Update - better mirroring 
Mirrors have been updated to actually fetch the active mirror, as opposed to using an old mirror and referencing that, and then letting the banned individual through.

You can also now view the mirrors for a ban.

Also denies entry for people who for _some_ reason lack a computer ID or an IP address. The former can be done by using a specific wsock32.dll in your BYOND bin to bypass bans.
 2016-05-01 13:47:33 +03:00
skull132
5d66916a45 Banning Update 
Fetches a CID and IP automatically, if none are entered.
 2016-04-30 15:02:11 +03:00
skull132
3e8ac5ee39 Vampire Re-write: Block 1 
The largest chunk of this rewrite.

Reworks the vampire powers, and makes them completely modular, as with changeling. Also adds a few powers, and so on.

A massive list of TO-DOs remains.
 2016-04-26 20:29:14 +03:00
Lord Lag
edbec1962f Fixes #263, #235. Tweaks ED 
Asides from two small bugfixes, adjusts Emergency Doors.
 2016-04-17 14:09:31 +01:00
skull132
61744e18e8 Aghost requires R_MOD or R_ADMIN 2016-04-02 22:30:45 +03:00
skull132
054c267d48 Merge pull request #239 from skull132/master 
Fixes #238
 2016-03-26 06:45:11 +02:00
skull132
f3ae9b6251 Fixes #238 2016-03-26 06:41:55 +02:00
skull132
68a2e3dcd9 Merge pull request #229 from Mahzel/development 
Characters database #109
 2016-03-25 23:23:19 +02:00
skull132
f24b15fa76 Merge pull request #236 from Aurorastation/development 
Development Merge - 25MAR2016
 2016-03-25 22:35:35 +02:00