cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-02-06 06:10:03 +00:00
Code Issues Packages Projects Releases Wiki Activity
14,506 Commits 8 Branches 26 Tags
e1192fea759d4db6a9475c6b71dbd071931e2b19
Commit Graph

2933 Commits

Author SHA1 Message Date
Segrain
c055f722dd Localised implant detection. 2013-09-14 23:50:31 +03:00
Segrain
35621466e1 Merge conflict fix. 2013-09-14 22:49:11 +03:00
Segrain
d8ad339fd8 Fix for throwing damage. 2013-09-13 19:41:23 +03:00
Segrain
d13f9e617b Fix for #3666. 2013-09-13 19:38:21 +03:00
Chinsky
c5c65c2f25 Merge pull request #3673 from LethalGhost/patch-1 
Fix for stool picking up.
 2013-09-12 22:51:38 -07:00
Lethal Ghost
09dc90c46b Fix for stool picking up. 2013-09-13 00:23:16 +06:00
meyar
2dd7fe538b Derp, deleted airlock access. MY B. 2013-09-12 13:49:49 -04:00
meyar
ef4defdae0 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-09-12 13:16:46 -04:00
meyar
3d6b510395 Restores a magically lost (again) feature. Traitor ID cards being reforgable. 2013-09-12 13:14:57 -04:00
Zuhayr
7ab7a61812 Merge resolution, using dev-freeze map. 2013-09-09 21:59:47 -07:00
Zuhayr
c7942b7eaf Merge pull request #3651 from SkyMarshal/airfixes 
ZAS update, needs testing.
 2013-09-07 05:46:04 -07:00
SkyMarshal
e8f9d19c75 Completed ZAS rework. Needs testing, and consideration to make zones sleep. 2013-09-03 20:25:03 -07:00
SkyMarshal
073f462e1b WIP ZAS rework. 2013-09-03 20:25:02 -07:00
Erthilo
3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm
 2013-09-02 23:32:33 +01:00
Erthilo
9e17473f62 Uncomments books. Generifies mentions of tg or baystation. 2013-09-02 18:24:11 +01:00
Erthilo
3662725155 Fixes for monkeycubes. 2013-09-02 17:44:47 +01:00
Erthilo
0008d649b0 Silent fix for megaphone. 2013-09-02 12:26:06 +01:00
Mloc-Argent
a084f74c7d Expansion of every "icon = ''" path. 
Supposed to help compilation times.  Who knows.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-09-01 21:53:36 +01:00
Erthilo
961ebcec35 Added Megaphones to all Heads offices. 2013-08-31 22:14:31 +01:00
Erthilo
b69c3b2ee4 Change hailer to hearable message. 2013-08-31 22:11:24 +01:00
Erthilo
547c1e670d Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work. 2013-08-31 20:12:19 +01:00
Erthilo
b75d97a488 Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev 
Conflicts:
	code/game/machinery/kitchen/gibber.dm
	code/modules/mob/living/carbon/human/inventory.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	maps/tgstation2.dmm
 2013-08-31 17:45:31 +01:00
Segrain
7dae19a3f9 Fix for #3498. 2013-08-30 04:40:39 +03:00
Mloc
15b0fc24a3 Merge pull request #3611 from Erthilo/dev 
Medical tweaks, fixes, admin secrets
 2013-08-29 03:51:09 -07:00
Zuhayr
dabd0866a2 As above. 2013-08-28 23:34:12 -07:00
Zuhayr
c17347ef77 Added CubeJackal's security gear to the appropriate lockers. 2013-08-28 22:31:22 -07:00
Mloc
4d928843b1 Merge pull request #3609 from Zuhayr/dev 
Stuff from dev-freeze.
 2013-08-28 10:40:58 -07:00
Erthilo
0219ffe41e Pull damage, with harsher damage in crit. Soft crit now at 0 health, you no longer suffocate in softcrit. Being between 0 to -50 health will cause you to go into shock. Below that you pass out and stop breathing. Stasis bags clone damage reduced to stop people dieing in them so much. 2013-08-28 17:38:21 +01:00
Erthilo
3557e12943 Suits with shoes protect against glass shards. 2013-08-28 12:49:23 +01:00
Erthilo
0cb361f737 Removed undeeded "ATTACK:" 2013-08-28 03:37:11 +01:00
Erthilo
3fbdc99079 Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs. 2013-08-28 03:33:04 +01:00
Erthilo
75f53ba5cd Reverts IA centcomm messaging due to the fax machine. 2013-08-27 22:12:04 +01:00
Erthilo
5437b1bbac Added two ears back. 2013-08-27 22:05:27 +01:00
Erthilo
1fd0522276 Gives Internal Affairs PDA a Message Centcomm option. Shortens Centcomm message time as it wasn't really being abused. Formats Centcomm messages better. 2013-08-27 14:24:12 +01:00
Zuhayr
591cde1ccb Emags now have a ten-use limit. 2013-08-24 19:25:05 -07:00
Segrain
f1f6c07ded Same mapfix, part 2. Also, minor update. 2013-08-24 09:35:14 +03:00
meyar
c0d264fed7 Fixes fire lockers. They actually start with stuff in them. 2013-08-23 20:39:08 -04:00
meyar
48dafb1904 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-23 20:02:16 -04:00
Segrain
40909bde53 Deconstruction fix. 2013-08-23 15:31:37 +03:00
Zuhayr
2cf9a18f9e Merge pull request #3572 from Baystation12/master 
Merging master into dev.
 2013-08-22 23:01:15 -07:00
Zuhayr
75896a8824 Fixes from Ravensdale to robot code, unsure of issue numbers. 2013-08-22 16:10:06 -07:00
Zuhayr
493dded8fb Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-08-22 15:29:59 -07:00
Segrain
57c1a9a556 Code cleanup. 2013-08-22 10:11:49 +03:00
Mloc-Argent
5cee2d2ac2 Species will no longer draw hair not allowed for them. Mirrors will no longer let you choose disallowed hair styles. 2013-08-21 23:26:59 +01:00
Segrain
475fae2790 Missing comment. 2013-08-21 05:58:07 +03:00
Erthilo
13caefe138 Uncomments Space Law book content. 2013-08-20 14:20:46 +01:00
Segrain
2304b743ce Reagent scanner's addition. 2013-08-17 17:00:33 +03:00
Segrain
8456647120 Type check. 2013-08-17 16:58:57 +03:00
Zuhayr
a30f7167bd Removed outdated var, fixed failure to show garbled monkey speech. 2013-08-17 19:03:20 -07:00
Mloc-Argent
1e980a9cc1 Merge branch 'master' into dev 2013-08-15 15:29:53 +01:00