Commit Graph
1091 Commits
Author SHA1 Message Date
NanakoACandskull132 4e61099040 Vomiting Overhaul (#365)
Centralises vomiting code to remove duplication and standardise effects.
Makes vomiting empty your stomach a bit (30u, the capacity of a drink
glass)
Adds Ipecac, an emetic to cause vomiting
2016-06-20 15:49:44 +03:00
Ryan784 650c34ee4c DEV Flags + Perms + Verbs
The Dev Flag and status is back in game! As of right now, you will have
to play around with the values in regards to the defines in setup.dm
(specifically with CCIAA), but everything works fine, besides maybe Devs
having some verbs they shouldn't for some reason..

But besides that, it's peachy.
2016-02-03 22:57:34 -05:00
Ryan784 1e4745d2a8 Merge pull request #1 from skull132/master
Dev Flags
2016-02-03 16:10:07 -05:00
skull132 8569d1c1ab +CCIAA Flag 2016-02-02 23:37:15 +02:00
skull132 fe48f26d71 Porting forensics from Aurora. 2016-02-01 17:08:47 +02:00
skull132 1c167ac363 Merge pull request #11 from skull132/rifles-import
Rifles import
2016-01-28 02:06:32 +02:00
skull132 205ed7ed42 Merge remote-tracking branch 'origin/just-in-case'
# Conflicts:
#	code/game/objects/items/weapons/weaponry.dm

Conflict clearance for vampire.
2016-01-28 01:32:20 +02:00
Ryan784 5f655dbbdb Vampire Gamemode Developement Test
The Vampire gamemode, as ported right now. The gamemode is in, as well
as creating a vampire through the traitor panel. All abilities seem to
function, unable to test enthrall however (though I have a feeling it
will have to be redone). Enthralling someone without a CKey will give
you the correct response, however.

Any abilities having to do with lums will need to be redone. Vamphud as
well.

If looking over this and pointing out errors/fixing is faster than
simply porting it yourself, then feel free to do so!
2016-01-20 22:14:21 -05:00
Ryan784 8925e7ba34 Non-human glove supply crates
Adds non-human glove supply crates to cargo
2016-01-13 20:50:18 -05:00
PsiOmegaDelta da080df765 Fixes records unintentionally referencing each other.
Because of the limitations of BYOND's bitwise operators (which affect both the old and new implementations of num2hex()), you cannot use numbers larger than 2^16 with that proc.
Manual port of https://github.com/PolarisSS13/Polaris/pull/430.
2015-12-05 09:25:56 +01:00
Hubblenaut 80cc83dbf8 Fixes backup power test light 2015-10-09 17:44:30 +02:00
skull132 507869d848 Sorts out two-handed ballistic weapons in their entirety:
* All automatic rifles need two hands for improved performance
* Shotguns need 2 hands to be racked
* AM rifle needs two hands to look down scope, and for improved accuracy
2015-09-20 22:34:53 +03:00
mwerezak dadc6e4b77 Adds logging for admin spawning antags 2015-08-17 21:10:24 -04:00
PsiOmega 862fad60c2 Fixes #10488.
A simple matter if incorrect type definition.
2015-08-11 19:36:02 +02:00
PsiOmegaDelta 211a427d65 Crew monitor balance and lag fixes.
Creates a central repository for crew data. This repository only updates data as necessary and only every 5th second, no matter how many times it is requested.
Reduces any lag caused by having multiple crew monitor windows open and as a bonus gives antags a larger window of opportunity for disabling sensors before detection of harm.
2015-08-11 09:27:18 +02:00
Mloc f04ca77bfb revert chargen rendering rework
fixes #9733

Signed-off-by: Mloc <colmohici@gmail.com>
2015-08-01 11:35:53 +01:00
Chinsky 390bf93d4d Merge pull request #10261 from PsiOmegaDelta/150722-LawNumbering
Fixes #10254.
2015-07-23 21:01:33 +03:00
Kelenius b83afb10f8 Moves supply pack check down to atom 2015-07-22 13:05:26 +03:00
Kelenius b637030c21 Fixes #9209 - cargo manifests don't show contents
This is a correct way of using initial() with a prototype that doesn't
create a new object
2015-07-22 10:35:22 +03:00
PsiOmegaDelta ec3faf35e8 Fixes #10254.
Nothing to see here.
2015-07-22 08:11:52 +02:00
PsiOmegaDelta cb1e57eb4e Law spelling corrections, removes some law sets from the law manager overview. 2015-07-14 09:01:13 +02:00
PsiOmegaDelta 8da7141af1 Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/mining/abandonedcrates.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
2015-07-14 08:11:11 +02:00
Zuhayr cd380aba24 Removed the last few references to MODE, fixed some oversights with player_is_antag(). 2015-07-14 05:19:00 +09:30
Zuhayr 7bb9ca6ec2 Fixes #10129 2015-07-14 05:18:58 +09:30
PsiOmega b1c26003d0 Further improves the server revision verb.
Now also includes the current branch name.
2015-07-13 12:18:09 +02:00
PsiOmegaDelta 16abe8148a Relocates drone law update to the new law set location. 2015-07-08 08:58:38 +02:00
Dragor 2c61ae8e12 Rewording of maintenance drones
Just slight rewording of a law to make clearer that they shouldn't interact with crew at all.
2015-07-05 00:07:55 +02:00
Zuhayr 8ab80b7394 Removes the RUST engine. 2015-07-01 15:50:55 +09:30
Zuhayr ec5e05b9f1 Antagonist system refactor. Fixes #9495, #9290, #9521, #8800 and #9465. 2015-06-21 18:08:26 +09:30
Zuhayr cef958cac2 Fixes #9503 2015-06-10 23:14:33 +09:30
PsiOmega 5e84bfa57c Merge remote-tracking branch 'upstream/master' into dev-freeze
Conflicts:
	code/modules/clothing/spacesuits/rig/suits/ert.dm
2015-05-30 15:59:54 +02:00
PsiOmegaDelta 12d1277925 Merge pull request #9577 from Zuhayr/dev-freeze
Fixes
2015-05-30 08:35:39 +02:00
Zuhayr eaf7e6718d Merge pull request #9553 from GinjaNinja32/reagent_protection
Fixes #5945, de-copy-pastes parapens and sleepypens
2015-05-30 13:57:31 +09:30
Zuhayr a4c2267984 Fixes #9386 2015-05-30 04:01:13 +09:30
PsiOmega 4ce737d87d Server build date and revision.
Can now see the current compilation date and revision:
* In the Dream Daemon log output.
* By using the "Show Server Revision" client verb which also links you to the commit in question.
2015-05-29 08:26:31 +02:00
GinjaNinja32 86f52910a1 Fixes #5945, de-copy-pastes parapens and sleepypens
Harm-syringes, hyposprays, parapens and sleepypens now all respect armour, and produce admin logs for transferred reagents if any are transferred.
2015-05-28 22:23:37 +01:00
Atlantis 97f0470504 Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-22 21:01:26 +02:00
Zuhayr 93b014c699 Merge with dev. 2015-05-20 13:39:31 +09:30
Chinsky 33e8791fe9 Merge pull request #9264 from Hubblenaut/airlocks
Fixes airlock wires
2015-05-18 18:21:05 +03:00
Hubblenaut 86426d0424 Fixes airlock wires and adds backup power light 2015-05-18 16:55:12 +02:00
Chinsky a3a2c615de Merge pull request #9300 from PsiOmegaDelta/RoundStart
Gamestart cleanup.
2015-05-18 12:00:49 +03:00
Zuhayr 358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr a101855343 Converted over hatchets and scythes. 2015-05-17 00:15:46 +09:30
PsiOmega bc0e87ceaa Destroying a camera now also cuts wires randomly. 2015-05-16 11:04:32 +02:00
PsiOmega 729a7a3ec9 Gamestart cleanup.
* setup_economy() was called twice.
* Game state is set to playing just before creating characters, this ensures equipment such as headsets initialize properly().
* Removes the sleep in manifest creation. Prevents duplicate manifest entries from occurring if one joins within 4 seconds of round start.
2015-05-16 10:59:45 +02:00
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
Chinsky 8d83e8d452 Merge pull request #9202 from Zuhayr/customitems
Custom items refactor.
2015-05-14 21:47:04 +03:00
Zuhayr 1dfade1a33 master>dev 2015-05-13 17:09:57 +09:30
Atlantiscze 090112c874 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into newmalf-merge 2015-05-13 06:17:26 +02:00
Zuhayr a9f936fe42 Added exosuit customisation kits to cargo. 2015-05-13 11:20:54 +09:30