cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-01-02 21:44:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,544 Commits 7 Branches 0 Tags
1a03079a669da13d065f5e939c97fd94e6fe26a5
Commit Graph

5785 Commits

Author SHA1 Message Date
comma
1a03079a66 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into viro 
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm
 2013-07-09 23:08:41 +04:00
fauxtada
c41abfc929 Edits contents of virology biohazard closets to be more virus resistant. Now with robust internals! 2013-07-09 07:02:17 -07:00
comma
722d4d27fb Fixed a typo. 2013-07-09 16:07:58 +04:00
comma
d5942c4b10 Updated HUDs to find only known viruses. 2013-07-09 13:04:05 +04:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
comma
ae2a9c56ad Merge branch 'master' into bleeding-edge-freeze 
Conflicts:
	code/modules/mob/living/silicon/robot/robot.dm
 2013-07-09 12:48:34 +04:00
Segrain
c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Segrain
72588c8c61 MedHUDs and virus2. 2013-07-09 04:51:09 +03:00
Spamcat
df90824d60 Whoa, 2 barsign.dm's? WTF? 2013-07-08 23:25:13 +04:00
Zuhayr
e9210b0701 Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting. 2013-07-07 02:28:34 -07:00
Zuhayr
9a2ce35199 Commenting out ninja mode, as it is broken. 2013-07-06 21:53:11 -07:00
Zuhayr
9dec8e311c Merge pull request #3252 from Segrain/bleeding-edge-freeze 
Examining cyborgs.
 2013-07-06 00:30:09 -07:00
Spamcat
5f690e150d Part 3: fixing shit 2013-07-06 02:53:06 +04:00
Spamcat
63de302a09 Part 2: construction. 2013-07-06 02:53:03 +04:00
Spamcat
0e4271f97c Stage 1: deconstruction. 2013-07-06 02:53:01 +04:00
Spamcat
87feed7e7b Nice colours (and a minor bugfix) 2013-07-06 02:53:00 +04:00
LordBraindead
ff912e132b readjusted composition of syndie bombs 
set them to produce a 1-2-5 explosion for the fire changes
 2013-07-05 19:55:28 +01:00
Segrain
5abed5a5f6 Modtype tweak. 2013-07-05 20:10:39 +03:00
Zuhayr
8f596f5fc1 Air alarm runtime fix. 2013-07-05 22:32:37 -07:00
Zuhayr
d04514e9ad Partial fix for #3087 2013-07-05 17:04:08 -07:00
LordBraindead
ba15e0f515 readjusted composition of syndie bombs 
set them to produce a 1-2-5 explosion for the fire changes
 2013-07-05 09:06:34 +02:00
Zuhayr
a1be7e431c Merge pull request #3245 from Zuhayr/feature 
SkyMarshal's ZAS fixes from bef.
 2013-07-04 23:14:04 -07:00
Zuhayr
dba4eb5eb2 Merge branch 'airfixes' of https://www.github.com/SkyMarshal/Baystation12 2013-07-05 16:14:38 -07:00
Zuhayr
15de508b49 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-04 23:29:48 -07:00
Zuhayr
1750f1e631 Merge pull request #3244 from Ispil/Staging 
Fixes issue #3240. The order for visible_message is visible, person, aud...
 2013-07-04 23:09:44 -07:00
Zuhayr
41784223e2 Merge pull request #3243 from SkyMarshal/airfixes 
Fixes some ZAS issues and improves air alarms some.
 2013-07-04 23:09:17 -07:00
Ispil
255408c026 Fixes issue #3240. The order for visible_message is visible, person, audible. Here, visible and person were reversed. 2013-07-04 21:13:33 -07:00
SkyMarshal
efd3d83e78 Reverts my firechanges, also air alarms now have a temperature regulation capacity. 2013-07-04 20:55:59 -07:00
Zuhayr
2c6e0e2bcc Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-07-04 20:32:24 -07:00
SkyMarshal
87f576fb64 ZAS and alarm fixes. 2013-07-04 20:22:19 -07:00
Spamcat
3a1ea41ff2 Moar machinery. 2013-07-05 04:39:57 +04:00
Spamcat
24eddd6eaa Now 100% more machinery! 2013-07-05 04:12:41 +04:00
Zuhayr
681fcb2881 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 2013-07-04 15:26:06 -07:00
Zuhayr
db650d3757 Config merge. 2013-07-04 14:39:46 -07:00
Ispil
4c1bb073ff Fixes issue #2872, partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way. 2013-07-04 04:55:24 -07:00
Zuhayr
a90fd2b4bb Merge pull request #3233 from Ispil/Bleeding-Edge-Freeze 
Removes the ability to create anything HONK-related in the mech fabricat...
 2013-07-04 00:36:51 -07:00
Ispil
8c6c03c9d6 Removes the ability to create anything HONK-related in the mech fabricator. Also removes the ability to add bananium, due to it thus being pointless to add due to the one thing it can build being removed. Note that everything is commented out, not deleted. 2013-07-04 00:28:40 -07:00
Zuhayr
b4695d3d74 Merge pull request #3232 from Ravensdale/master 
Custom synthetic sprites and minor bugfixes
 2013-07-03 22:21:15 -07:00
Ravensdale
9aedfa8b23 Bugfix: Fixes mining borg's radio to the supply frequency since mining frequency no longer exists. 
Feature: Introduces and adjusts code for cyborg and AI custom sprites

Cleanup: Streamlined the AI core selection code. Could probably be even cleaner but it's good for now.
 2013-07-03 21:24:25 -07:00
Zuhayr
969cb820a0 Merge pull request #3229 from Segrain/bleeding-edge-freeze 
Records access for cyborgs.
 2013-07-03 01:52:44 -07:00
Segrain
66265e2689 Recordskeeping update. 2013-07-03 05:55:18 +03:00
Ispil
88791eec5c Makes the Crew Manifest default on all PDAs, and removes the access_manifest variable from cartridges. Also moves the manifest function into the PDA code, instead of cartridge code. 2013-07-02 19:14:10 -07:00
Mloc-Argent
cf4bd39f6e Updated the linkage between the NanoTrasen IRC bot and the server. 
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
 2013-07-02 23:41:40 +01:00
Spamcat
d0236394ef Client, mind, big difference... 2013-07-01 20:02:42 +04:00
Spamcat
11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops 
Conflicts:
	code/game/gamemodes/objective.dm
 2013-07-01 19:49:29 +04:00
Spamcat
10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
comma
50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
comma
da884f4ddc Merge branch 'bleeding-edge-freeze' of https://github.com/comma/Baystation12 into viro 2013-07-01 17:23:09 +04:00
comma
05142eac35 Fixed formatting issue. 
Editing name and description works now.
 2013-07-01 15:14:30 +04:00
Zuhayr
e3696a13e9 Redundancy fix. 2013-07-01 19:51:03 -07:00